Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #593 from iranl/ota-http-event-logging

Browse Source 
Improve OTA HTTP event logging
This commit is contained in:
iranl
2025-01-04 14:27:10 +01:00
committed by GitHub
parent 7a3895bff8 a017af70ad
commit e1ca074b37
2 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@@ -5,7 +5,7 @@
#define NUKI_HUB_VERSION "9.07" #define NUKI_HUB_VERSION "9.07"
#define NUKI_HUB_VERSION_INT (uint32_t)907 #define NUKI_HUB_VERSION_INT (uint32_t)907
#define NUKI_HUB_BUILD "unknownbuildnr" #define NUKI_HUB_BUILD "unknownbuildnr"
#define NUKI_HUB_DATE "2025-01-03" #define NUKI_HUB_DATE "2025-01-04"
#define GITHUB_LATEST_RELEASE_URL (char*)"https://github.com/technyon/nuki_hub/releases/latest" #define GITHUB_LATEST_RELEASE_URL (char*)"https://github.com/technyon/nuki_hub/releases/latest"
#define GITHUB_OTA_MANIFEST_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/manifest.json" #define GITHUB_OTA_MANIFEST_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/manifest.json"

63
src/main.cpp
View File

@@ -89,6 +89,7 @@ RTC_NOINIT_ATTR bool disableNetwork;
RTC_NOINIT_ATTR bool wifiFallback; RTC_NOINIT_ATTR bool wifiFallback;
RTC_NOINIT_ATTR bool ethCriticalFailure; RTC_NOINIT_ATTR bool ethCriticalFailure;
int lastHTTPeventId = -1;
bool doOta = false; bool doOta = false;
bool restartReason_isValid; bool restartReason_isValid;
RestartReason currentRestartReason = RestartReason::NotApplicable; RestartReason currentRestartReason = RestartReason::NotApplicable;
@@ -252,7 +253,7 @@ void nukiTask(void *pvParameters)
if (preferences->getBool(preference_mqtt_ssl_enabled, false)) if (preferences->getBool(preference_mqtt_ssl_enabled, false))
{ {
#ifdef CONFIG_SOC_SPIRAM_SUPPORTED #ifdef CONFIG_SOC_SPIRAM_SUPPORTED
if (esp_psram_get_size() <= 0) if (esp_psram_get_size() <= 0)
{ {
Log->println("Waiting 20 seconds to start BLE because of MQTT SSL"); Log->println("Waiting 20 seconds to start BLE because of MQTT SSL");
delay(20000); delay(20000);
@@ -351,34 +352,42 @@ void bootloopDetection()
esp_err_t _http_event_handler(esp_http_client_event_t *evt) esp_err_t _http_event_handler(esp_http_client_event_t *evt)
{ {
switch (evt->event_id) if (lastHTTPeventId != int(evt->event_id))
{ {
case HTTP_EVENT_ERROR: Log->println("");
Log->println("HTTP_EVENT_ERROR"); switch (evt->event_id)
break; {
case HTTP_EVENT_ON_CONNECTED: case HTTP_EVENT_ERROR:
Log->println("HTTP_EVENT_ON_CONNECTED"); Log->println("HTTP_EVENT_ERROR");
break; break;
case HTTP_EVENT_HEADER_SENT: case HTTP_EVENT_ON_CONNECTED:
Log->println("HTTP_EVENT_HEADER_SENT"); Log->print("HTTP_EVENT_ON_CONNECTED");
break; break;
case HTTP_EVENT_ON_HEADER: case HTTP_EVENT_HEADER_SENT:
Log->println("HTTP_EVENT_ON_HEADER"); Log->print("HTTP_EVENT_HEADER_SENT");
break; break;
case HTTP_EVENT_ON_DATA: case HTTP_EVENT_ON_HEADER:
Log->println("HTTP_EVENT_ON_DATA"); Log->print("HTTP_EVENT_ON_HEADER");
break; break;
case HTTP_EVENT_ON_FINISH: case HTTP_EVENT_ON_DATA:
Log->println("HTTP_EVENT_ON_FINISH"); Log->print("HTTP_EVENT_ON_DATA");
break; break;
case HTTP_EVENT_DISCONNECTED: case HTTP_EVENT_ON_FINISH:
Log->println("HTTP_EVENT_DISCONNECTED"); Log->println("HTTP_EVENT_ON_FINISH");
break; break;
case HTTP_EVENT_REDIRECT: case HTTP_EVENT_DISCONNECTED:
Log->println("HTTP_EVENT_REDIRECT"); Log->println("HTTP_EVENT_DISCONNECTED");
break; break;
case HTTP_EVENT_REDIRECT:
Log->print("HTTP_EVENT_REDIRECT");
break;
}
} }
else
{
Log->print(".");
}
lastHTTPeventId = int(evt->event_id);
wdt_hal_context_t rtc_wdt_ctx = RWDT_HAL_CONTEXT_DEFAULT(); wdt_hal_context_t rtc_wdt_ctx = RWDT_HAL_CONTEXT_DEFAULT();
wdt_hal_write_protect_disable(&rtc_wdt_ctx); wdt_hal_write_protect_disable(&rtc_wdt_ctx);
wdt_hal_feed(&rtc_wdt_ctx); wdt_hal_feed(&rtc_wdt_ctx);