comparison: main/task_user.c
main/task_user.c
- changeset 36
- e2a43e7c4035
- parent 34
- 495b7eafbf5a
- child 37
- 358bbd5b608e
equal
deleted
inserted
replaced
| 35:090b9d36b7a1 | 36:e2a43e7c4035 |
|---|---|
| 330 /** | 330 /** |
| 331 * @brief The splash screen shown during cold boot or user wakeup. | 331 * @brief The splash screen shown during cold boot or user wakeup. |
| 332 */ | 332 */ |
| 333 void screen_splash() | 333 void screen_splash() |
| 334 { | 334 { |
| 335 // screen_top("CO2 meter %s", app_desc->version); | 335 screen_top("CO2 meter %s", app_desc->version); |
| 336 | 336 |
| 337 // u8g2_SetFont(&u8g2, u8g2_font_t0_22b_tf); | 337 u8g2_SetFont(&u8g2, u8g2_font_t0_22b_tf); |
| 338 // u8g2_uint_t w = u8g2_GetUTF8Width(&u8g2, "Welkom"); | 338 u8g2_uint_t w = u8g2_GetUTF8Width(&u8g2, "Welkom"); |
| 339 // u8g2_DrawUTF8(&u8g2, (128 - w) / 2,50, "Welkom"); | 339 u8g2_DrawUTF8(&u8g2, (128 - w) / 2,50, "Welkom"); |
| 340 | |
| 341 u8g2_SetDrawColor(&u8g2, 1); | |
| 342 u8g2_DrawBox(&u8g2, 0, 0, 128, 64); | |
| 343 | |
| 344 u8g2_SendBuffer(&u8g2); | 340 u8g2_SendBuffer(&u8g2); |
| 345 u8g2_SetPowerSave(&u8g2, 0); // wake up display | 341 u8g2_SetPowerSave(&u8g2, 0); // wake up display |
| 346 } | 342 } |
| 347 | 343 |
| 348 | 344 |
| 1004 case ML2_SEL_SENSOR2: | 1000 case ML2_SEL_SENSOR2: |
| 1005 case ML2_SEL_SENSOR3: | 1001 case ML2_SEL_SENSOR3: |
| 1006 idx = Main_Loop2 - ML2_SEL_SENSOR1; | 1002 idx = Main_Loop2 - ML2_SEL_SENSOR1; |
| 1007 if ((SubMenu + SubOffset) < num_sensors) { | 1003 if ((SubMenu + SubOffset) < num_sensors) { |
| 1008 ESP_LOGI(TAG, "Select sensor %d %s for unit %d", SubMenu + SubOffset, sensors[SubMenu + SubOffset], idx + 1); | 1004 ESP_LOGI(TAG, "Select sensor %d %s for unit %d", SubMenu + SubOffset, sensors[SubMenu + SubOffset], idx + 1); |
| 1009 | 1005 if (xSemaphoreTake(xSemaphoreUnits, 25) == pdTRUE) { |
| 1006 strcpy(units[idx].temperature_rom_code, sensors[SubMenu + SubOffset]); | |
| 1007 write_units(); | |
| 1008 xSemaphoreGive(xSemaphoreUnits); | |
| 1009 New_Loop2 = ML2_SETUP_UNIT1 + idx; | |
| 1010 SubMenu = 2; | |
| 1011 SubOffset = 0; | |
| 1012 if (Main_Loop1 == ML1_DONE) | |
| 1013 Main_Loop1 = ML1_INIT; | |
| 1014 } else { | |
| 1015 ESP_LOGE(TAG, "Failed units lock for new romcode"); | |
| 1016 } | |
| 1010 } else { | 1017 } else { |
| 1011 New_Loop2 = ML2_SETUP_UNIT1 + idx; | 1018 New_Loop2 = ML2_SETUP_UNIT1 + idx; |
| 1012 SubMenu = 2; | 1019 SubMenu = 2; |
| 1013 SubOffset = 0; | 1020 SubOffset = 0; |
| 1014 } | 1021 } |
