From e7603a76590bd0994e2cb24b6e7aba9113565013 Mon Sep 17 00:00:00 2001 From: samuelbles07 Date: Mon, 14 Apr 2025 15:24:53 +0700 Subject: [PATCH] Update feedback Change airgradient-ota submodule to latest main instead of branch --- examples/OneOpenAir/OneOpenAir.ino | 12 +++++++----- src/Libraries/airgradient-ota | 2 +- src/Sgp41/Sgp41.cpp | 6 +++--- src/Sgp41/Sgp41.h | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index 794fbb3..8efbd0f 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -584,7 +584,7 @@ void otaHandlerCallback(AirgradientOTA::OtaResult result, const char *msg) { Serial.println("Firmware update starting..."); if (configuration.hasSensorSGP && networkOption == UseCellular) { // Temporary pause SGP41 task while cellular firmware update is in progress - ag->sgp41.pauseHandle(); + ag->sgp41.pause(); } displayExecuteOta(result, fwNewVersion, 0); break; @@ -594,13 +594,15 @@ void otaHandlerCallback(AirgradientOTA::OtaResult result, const char *msg) { displayExecuteOta(result, "", std::stoi(msg)); break; case AirgradientOTA::Failed: + displayExecuteOta(result, "", 0); + if (configuration.hasSensorSGP && networkOption == UseCellular) { + // Cellular firmware update finish, resuming SGP41 task + ag->sgp41.resume(); + } + break; case AirgradientOTA::Skipped: case AirgradientOTA::AlreadyUpToDate: displayExecuteOta(result, "", 0); - if (configuration.hasSensorSGP && networkOption == UseCellular) { - // Cellular firmware update finish, resuming SGP41 task - ag->sgp41.resumeHandle(); - } break; case AirgradientOTA::Success: displayExecuteOta(result, "", 0); diff --git a/src/Libraries/airgradient-ota b/src/Libraries/airgradient-ota index be4e839..81a0189 160000 --- a/src/Libraries/airgradient-ota +++ b/src/Libraries/airgradient-ota @@ -1 +1 @@ -Subproject commit be4e839f2927decfa78e16fa49167d6728163ccd +Subproject commit 81a0189f54c45485d4a58de29b394105466e5530 diff --git a/src/Sgp41/Sgp41.cpp b/src/Sgp41/Sgp41.cpp index 2a0d34d..3170744 100644 --- a/src/Sgp41/Sgp41.cpp +++ b/src/Sgp41/Sgp41.cpp @@ -132,7 +132,7 @@ void Sgp41::handle(void) { #else -void Sgp41::pauseHandle() { +void Sgp41::pause() { onPause = true; Serial.println("Pausing SGP41 handler task"); // Set latest value to invalid @@ -142,9 +142,9 @@ void Sgp41::pauseHandle() { nox = utils::getInvalidNOx(); } -void Sgp41::resumeHandle() { +void Sgp41::resume() { onPause = false; - Serial.println("Resume SGP41 handler task"); + Serial.println("Resuming SGP41 handler task"); } /** diff --git a/src/Sgp41/Sgp41.h b/src/Sgp41/Sgp41.h index b8275e6..5758048 100644 --- a/src/Sgp41/Sgp41.h +++ b/src/Sgp41/Sgp41.h @@ -19,9 +19,9 @@ public: void handle(void); #else /* pause _handle task to read sensor */ - void pauseHandle(); + void pause(); /* resume _handle task to read sensor */ - void resumeHandle(); + void resume(); void _handle(void); #endif void end(void);