comparison: main/co2meter.c
main/co2meter.c
- changeset 22
- cceb36fd3a2a
- parent 21
- 043ae27633f8
- child 23
- 58a328e91881
equal
deleted
inserted
replaced
| 21:043ae27633f8 | 22:cceb36fd3a2a |
|---|---|
| 184 break; | 184 break; |
| 185 | 185 |
| 186 case ML1_CONNECT: | 186 case ML1_CONNECT: |
| 187 if (ready_WiFi()) { | 187 if (ready_WiFi()) { |
| 188 Main_Loop1 = ML1_MQTT_CONNECT; | 188 Main_Loop1 = ML1_MQTT_CONNECT; |
| 189 // if (Main_Loop2 == ML2_WIFI) | 189 user_refresh(); |
| 190 // screen_wifi(); | |
| 191 } | 190 } |
| 192 break; | 191 break; |
| 193 | 192 |
| 194 case ML1_MQTT_CONNECT: | 193 case ML1_MQTT_CONNECT: |
| 195 if (ready_ds18b20() && ready_adc()) { | 194 if (ready_ds18b20() && ready_adc()) { |
| 237 } | 236 } |
| 238 } | 237 } |
| 239 write_units(); | 238 write_units(); |
| 240 xSemaphoreGive(xSemaphoreUnits); | 239 xSemaphoreGive(xSemaphoreUnits); |
| 241 user_refresh(); | 240 user_refresh(); |
| 242 // switch (Main_Loop2) { | |
| 243 // case ML2_USER: screen_main(); break; | |
| 244 // case ML2_UNIT1: screen_unit(0); break; | |
| 245 // case ML2_UNIT2: screen_unit(1); break; | |
| 246 // case ML2_UNIT3: screen_unit(2); break; | |
| 247 // } | |
| 248 } | 241 } |
| 249 } | 242 } |
| 250 break; | 243 break; |
| 251 | 244 |
| 252 case ML1_WAITCON: | 245 case ML1_WAITCON: |
| 283 | 276 |
| 284 case ML1_WIFI_OFF: | 277 case ML1_WIFI_OFF: |
| 285 if (! ready_WiFi()) { | 278 if (! ready_WiFi()) { |
| 286 ESP_LOGI(TAG, "Loop timer: Done %s", user_busy() ? "true":"false"); | 279 ESP_LOGI(TAG, "Loop timer: Done %s", user_busy() ? "true":"false"); |
| 287 Main_Loop1 = ML1_DONE; | 280 Main_Loop1 = ML1_DONE; |
| 288 // if (Main_Loop2 == ML2_WIFI) | 281 user_refresh(); |
| 289 // screen_wifi(); | |
| 290 } | 282 } |
| 291 break; | 283 break; |
| 292 | 284 |
| 293 case ML1_DONE: | 285 case ML1_DONE: |
| 294 break; | 286 break; |
