C3MA/PlantCtrl
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added ota state debugging

Browse Source
This commit is contained in:
Empire 2023-05-17 18:24:09 +02:00
parent 1cc46a360b
commit cf7ff9b0d1
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp32/include/ControllerConfiguration.h
View File

@ -80,7 +80,7 @@
/** \addtogroup Configuration /** \addtogroup Configuration
* @{ * @{
*/ */
#define FIRMWARE_VERSION "2.5 HW0.10b" #define FIRMWARE_VERSION "2.7 HW0.10b"
#define TIMED_LIGHT_PIN CUSTOM1_PIN5 #define TIMED_LIGHT_PIN CUSTOM1_PIN5
#define FLOWMETER_PIN CUSTOM1_PIN1 #define FLOWMETER_PIN CUSTOM1_PIN1

24
esp32/src/main.cpp
View File

@ -13,6 +13,7 @@
/****************************************************************************** /******************************************************************************
* INCLUDES * INCLUDES
******************************************************************************/ ******************************************************************************/
#define CONFIG_APP_ROLLBACK_ENABLE
#include "LogDefines.h" #include "LogDefines.h"
#include "FileUtils.h" #include "FileUtils.h"
#include "TimeUtils.h" #include "TimeUtils.h"
@ -36,6 +37,12 @@
#include "driver/pcnt.h" #include "driver/pcnt.h"
#include "MQTTUtils.h" #include "MQTTUtils.h"
#include "esp_ota_ops.h" #include "esp_ota_ops.h"
#include "Arduino.h"
extern "C" bool verifyRollbackLater(){
return true;
}
#if defined(TIMED_LIGHT_PIN) #if defined(TIMED_LIGHT_PIN)
#include "ulp-pwm.h" #include "ulp-pwm.h"
#endif #endif
@ -141,10 +148,23 @@ void finsihedCycleSucessfully()
esp_ota_img_states_t ota_state; esp_ota_img_states_t ota_state;
if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK)
{ {
log(LOG_LEVEL_INFO, "Get State Partition was Successfull", LOG_BOOT_ERROR_DETECTION); log(LOG_LEVEL_INFO, "Get State Partition was Successfull", LOG_BOOT_ERROR_DETECTION);
if(ota_state == ESP_OTA_IMG_UNDEFINED){
log(LOG_LEVEL_INFO, "ESP_OTA_IMG_UNDEFINED should not happen with rollback", LOG_BOOT_ERROR_DETECTION);
}
if(ota_state == ESP_OTA_IMG_NEW){
log(LOG_LEVEL_INFO, "ESP_OTA_IMG_NEW", LOG_BOOT_ERROR_DETECTION);
}
if(ota_state == ESP_OTA_IMG_INVALID){
log(LOG_LEVEL_INFO, "ESP_OTA_IMG_INVALID", LOG_BOOT_ERROR_DETECTION);
}
if(ota_state == ESP_OTA_IMG_VALID){
log(LOG_LEVEL_INFO, "ESP_OTA_IMG_VALID", LOG_BOOT_ERROR_DETECTION);
}
if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) if (ota_state == ESP_OTA_IMG_PENDING_VERIFY)
{ {
log(LOG_LEVEL_INFO, "Diagnostics completed successfully! Marking as valid", LOG_BOOT_ERROR_DETECTION); log(LOG_LEVEL_INFO, "ESP_OTA_IMG_PENDING_VERIFY Diagnostics completed successfully! Marking as valid", LOG_BOOT_ERROR_DETECTION);
esp_ota_mark_app_valid_cancel_rollback(); esp_ota_mark_app_valid_cancel_rollback();
} }
} }