comparison: main/iotbalkon.c
main/iotbalkon.c
- changeset 20
- c3001154416f
- parent 19
- 66aeab4ed38d
- child 21
- df8564c9701e
equal
deleted
inserted
replaced
| 19:66aeab4ed38d | 20:c3001154416f |
|---|---|
| 386 xTaskCreate(&task_ina219, "task_ina219", 2560, NULL, 8, &xTaskINA219); | 386 xTaskCreate(&task_ina219, "task_ina219", 2560, NULL, 8, &xTaskINA219); |
| 387 xTaskCreate(&task_apds9930, "task_apds9930", 2560, NULL, 8, &xTaskAPDS9930); | 387 xTaskCreate(&task_apds9930, "task_apds9930", 2560, NULL, 8, &xTaskAPDS9930); |
| 388 xTaskCreate(&task_out, "task_out", 2560, NULL, 9, &xTaskOUT); | 388 xTaskCreate(&task_out, "task_out", 2560, NULL, 9, &xTaskOUT); |
| 389 // esp_log_level_set("MQTT_CLIENT", ESP_LOG_ERROR); | 389 // esp_log_level_set("MQTT_CLIENT", ESP_LOG_ERROR); |
| 390 xTaskCreate(&task_mqtt, "task_mqtt", 4096, NULL, 5, &xTaskMQTT); | 390 xTaskCreate(&task_mqtt, "task_mqtt", 4096, NULL, 5, &xTaskMQTT); |
| 391 // esp_log_level_set("wifi", ESP_LOG_ERROR); | 391 esp_log_level_set("wifi", ESP_LOG_ERROR); |
| 392 xTaskCreate(&task_wifi, "task_wifi", 4096, NULL, 3, &xTaskWifi); | 392 xTaskCreate(&task_wifi, "task_wifi", 4096, NULL, 3, &xTaskWifi); |
| 393 | 393 |
| 394 vTaskDelay(10 / portTICK_PERIOD_MS); | 394 vTaskDelay(10 / portTICK_PERIOD_MS); |
| 395 | 395 |
| 396 /* | 396 /* |
| 527 // } else { | 527 // } else { |
| 528 Alarm &= ~AL_ACCULOW; | 528 Alarm &= ~AL_ACCULOW; |
| 529 // } | 529 // } |
| 530 } | 530 } |
| 531 getTempBaro(); | 531 getTempBaro(); |
| 532 vTaskDelay(2000 / portTICK_PERIOD_MS); | |
| 532 publish(); | 533 publish(); |
| 533 State = State_WorkDone; | 534 State = State_WorkDone; |
| 534 gTimeNext = millis() + SUB_TIME; | 535 /* |
| 535 break; | 536 * Wait an extra second so the publish message will reach |
| 536 | 537 * the broker and the subscriptions are really here. |
| 537 case State_WorkDone: vTaskDelay(20 / portTICK_PERIOD_MS); | 538 */ |
| 538 if (gTimeInMillis > gTimeNext) { | 539 gTimeNext = millis() + 1000; |
| 540 break; | |
| 541 | |
| 542 case State_WorkDone: if (gTimeInMillis > gTimeNext) { | |
| 539 State = State_Disconnect_MQTT; | 543 State = State_Disconnect_MQTT; |
| 540 request_mqtt(false); | 544 request_mqtt(false); |
| 541 } | 545 } |
| 546 vTaskDelay(50 / portTICK_PERIOD_MS); | |
| 542 break; | 547 break; |
| 543 | 548 |
| 544 case State_Disconnect_MQTT: wait_mqtt(10000); | 549 case State_Disconnect_MQTT: wait_mqtt(10000); |
| 545 State = State_Disconnect_Wifi; | 550 State = State_Disconnect_Wifi; |
| 546 break; | 551 break; |
| 575 // } | 580 // } |
| 576 nvsio_write_u8((char *)"ds_active", 1); | 581 nvsio_write_u8((char *)"ds_active", 1); |
| 577 DS_Active = 1; | 582 DS_Active = 1; |
| 578 nvsio_write_u32((char *)"ds_time", ds_time); | 583 nvsio_write_u32((char *)"ds_time", ds_time); |
| 579 DS_Time = ds_time; | 584 DS_Time = ds_time; |
| 580 // if ((! EEPROM.read(EM_DS_Active)) || (EEPROM.read(EM_DS_Time) != ds_time)) { | |
| 581 // EEPROM.write(EM_DS_Active, 1); | |
| 582 // EEPROM.write(EM_DS_Time, ds_time); | |
| 583 // EEPROM.commit(); | |
| 584 // Serial.println("wrote new deep-sleep settings"); | |
| 585 // } | |
| 586 State = State_GoSleep; | 585 State = State_GoSleep; |
| 587 } | 586 } |
| 588 break; | 587 break; |
| 589 | 588 |
| 590 case State_Wait: if (gTimeInMillis > gTimeNext) { | 589 case State_Wait: if (gTimeInMillis > gTimeNext) { |
