comparison: main/iotbalkon.c
main/iotbalkon.c
- changeset 22
- 9c0bcc91fe1a
- parent 21
- df8564c9701e
- child 23
- 2cc30d828d6e
equal
deleted
inserted
replaced
| 21:df8564c9701e | 22:9c0bcc91fe1a |
|---|---|
| 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); | |
| 392 xTaskCreate(&task_wifi, "task_wifi", 4096, NULL, 3, &xTaskWifi); | 391 xTaskCreate(&task_wifi, "task_wifi", 4096, NULL, 3, &xTaskWifi); |
| 393 | 392 |
| 394 vTaskDelay(10 / portTICK_PERIOD_MS); | 393 vTaskDelay(10 / portTICK_PERIOD_MS); |
| 395 | 394 |
| 396 /* | 395 /* |
| 519 BatteryState(batteryVolts, (0 - batteryCurrent) + solarCurrent); | 518 BatteryState(batteryVolts, (0 - batteryCurrent) + solarCurrent); |
| 520 | 519 |
| 521 ESP_LOGI(TAG, " Solar Volts: %.4fV Current %.4fmA Power %.4fmW", solarVolts, solarCurrent, solarPower); | 520 ESP_LOGI(TAG, " Solar Volts: %.4fV Current %.4fmA Power %.4fmW", solarVolts, solarCurrent, solarPower); |
| 522 ESP_LOGI(TAG, "Battery Volts: %.4fV Current %.4fmA Power %.4fmW", batteryVolts, batteryCurrent, batteryPower); | 521 ESP_LOGI(TAG, "Battery Volts: %.4fV Current %.4fmA Power %.4fmW", batteryVolts, batteryCurrent, batteryPower); |
| 523 | 522 |
| 524 /* Check alarm conditions */ | 523 #ifdef CONFIG_CODE_PRODUCTION |
| 524 /* Check alarm conditions */ | |
| 525 if (batteryState <= 10) { | 525 if (batteryState <= 10) { |
| 526 Alarm |= AL_ACCULOW; | 526 Alarm |= AL_ACCULOW; |
| 527 } else { | 527 } else { |
| 528 Alarm &= ~AL_ACCULOW; | 528 Alarm &= ~AL_ACCULOW; |
| 529 } | 529 } |
| 530 #endif | |
| 531 #ifdef CONFIG_CODE_TESTING | |
| 532 Alarm &= ~AL_ACCULOW; | |
| 533 #endif | |
| 530 } | 534 } |
| 531 getTempBaro(); | 535 getTempBaro(); |
| 532 vTaskDelay(2000 / portTICK_PERIOD_MS); | 536 vTaskDelay(2000 / portTICK_PERIOD_MS); |
| 533 publish(); | 537 publish(); |
| 534 State = State_WorkDone; | 538 State = State_WorkDone; |
| 608 case State_GoSleep: ESP_LOGI(TAG, "Going to deep-sleep for %ld seconds", DS_Time); | 612 case State_GoSleep: ESP_LOGI(TAG, "Going to deep-sleep for %ld seconds", DS_Time); |
| 609 ESP_ERROR_CHECK(esp_sleep_enable_timer_wakeup(DS_Time * 1e6)); | 613 ESP_ERROR_CHECK(esp_sleep_enable_timer_wakeup(DS_Time * 1e6)); |
| 610 esp_deep_sleep_start(); | 614 esp_deep_sleep_start(); |
| 611 break; | 615 break; |
| 612 } | 616 } |
| 613 vTaskDelay(20 / portTICK_PERIOD_MS); | 617 vTaskDelay(10 / portTICK_PERIOD_MS); |
| 614 } | 618 } |
| 615 // Not reached. | 619 // Not reached. |
| 616 } | 620 } |
