From 0b4884652f7b21743db1c07c4b22ff5c06839bdc Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Thu, 12 Feb 2026 12:28:31 +0100 Subject: [PATCH] Allow for more errors during upgrade (#1139) * Allow for more errors during upgrade * More instead of equals --- lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h | 2 ++ lib/AmsFirmwareUpdater/src/AmsFirmwareUpdater.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h b/lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h index 76cc62f8..b0ba4979 100644 --- a/lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h +++ b/lib/AmsFirmwareUpdater/include/AmsFirmwareUpdater.h @@ -39,6 +39,8 @@ #define AMS_UPDATE_ERR_SUCCESS_CONFIRMED 123 #define UPDATE_BUF_SIZE 4096 +#define UPDATE_MAX_BLOCK_RETRY 25 +#define UPDATE_MAX_REBOOT_RETRY 12 class AmsFirmwareUpdater { public: diff --git a/lib/AmsFirmwareUpdater/src/AmsFirmwareUpdater.cpp b/lib/AmsFirmwareUpdater/src/AmsFirmwareUpdater.cpp index 9c55804d..a082016d 100644 --- a/lib/AmsFirmwareUpdater/src/AmsFirmwareUpdater.cpp +++ b/lib/AmsFirmwareUpdater/src/AmsFirmwareUpdater.cpp @@ -74,7 +74,7 @@ void AmsFirmwareUpdater::setUpgradeInformation(UpgradeInformation& upinfo) { #endif debugger->printf_P(PSTR("Resuming uprade to %s\n"), updateStatus.toVersion); - if(updateStatus.reboot_count++ < 8) { + if(updateStatus.reboot_count++ < UPDATE_MAX_REBOOT_RETRY) { updateStatus.errorCode = AMS_UPDATE_ERR_OK; } else { updateStatus.errorCode = AMS_UPDATE_ERR_REBOOT; @@ -129,7 +129,7 @@ void AmsFirmwareUpdater::loop() { HTTPClient http; start = millis(); if(!fetchFirmwareChunk(http)) { - if(updateStatus.retry_count++ == 3) { + if(updateStatus.retry_count++ > UPDATE_MAX_BLOCK_RETRY) { updateStatus.errorCode = AMS_UPDATE_ERR_FETCH; updateStatusChanged = true; }