From 81a450295249e4786425a0a00a1fdd5945f23071 Mon Sep 17 00:00:00 2001 From: samuelbles07 Date: Mon, 21 Apr 2025 13:27:05 +0700 Subject: [PATCH 1/2] Fix: http domain applied for OTA --- examples/OneOpenAir/OneOpenAir.ino | 12 ++++++++++-- src/Libraries/airgradient-ota | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index 3241e11f..399a0cc5 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -352,7 +352,7 @@ void loop() { static bool pmsConnected = false; if (pmsConnected != ag->pms5003.connected()) { pmsConnected = ag->pms5003.connected(); - Serial.printf("PMS sensor %s ", pmsConnected?"connected":"removed"); + Serial.printf("PMS sensor %s \n", pmsConnected?"connected":"removed"); } } } else { @@ -566,7 +566,15 @@ void checkForFirmwareUpdate(void) { firmwareUpdateInProgress = true; agOta->setHandlerCallback(otaHandlerCallback); - agOta->updateIfAvailable(ag->deviceId().c_str(), GIT_VERSION); + + String httpDomain = configuration.getHttpDomain(); + if (httpDomain != "") { + Serial.printf("httpDomain configuration available, start OTA with custom domain\n", + httpDomain.c_str()); + agOta->updateIfAvailable(ag->deviceId().c_str(), GIT_VERSION, httpDomain.c_str()); + } else { + agOta->updateIfAvailable(ag->deviceId().c_str(), GIT_VERSION); + } // Only goes to this line if firmware update is not success // Handled by otaHandlerCallback diff --git a/src/Libraries/airgradient-ota b/src/Libraries/airgradient-ota index 81a0189f..9287340d 160000 --- a/src/Libraries/airgradient-ota +++ b/src/Libraries/airgradient-ota @@ -1 +1 @@ -Subproject commit 81a0189f54c45485d4a58de29b394105466e5530 +Subproject commit 9287340d7ece43612270ebb96c8b714df9962fbb From 4daa817a0b213444ddcb51ea687140bf03699d25 Mon Sep 17 00:00:00 2001 From: samuelbles07 Date: Mon, 21 Apr 2025 13:41:15 +0700 Subject: [PATCH 2/2] Change airgradient-ota commit to main branch --- src/Libraries/airgradient-ota | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Libraries/airgradient-ota b/src/Libraries/airgradient-ota index 9287340d..c7723924 160000 --- a/src/Libraries/airgradient-ota +++ b/src/Libraries/airgradient-ota @@ -1 +1 @@ -Subproject commit 9287340d7ece43612270ebb96c8b714df9962fbb +Subproject commit c772392427cf343cbb9afedfb395e5a027cfb046