Merge from 2.3

This commit is contained in:
Bertrand Songis
2019-12-05 09:29:11 +01:00
161 changed files with 3682 additions and 10305 deletions
+2 -2
View File
@@ -446,7 +446,7 @@ bool Pxx2OtaUpdate::waitStep(uint8_t step, uint8_t timeout)
OtaUpdateInformation * destination = moduleState[module].otaUpdateInformation;
uint8_t elapsed = 0;
watchdogSuspend(100);
watchdogSuspend(100 /*1s*/);
while (step != destination->step) {
if (elapsed++ > timeout) {
@@ -535,7 +535,7 @@ void Pxx2OtaUpdate::flashFirmware(const char * filename, ProgressHandler progres
{
pausePulses();
watchdogSuspend(100);
watchdogSuspend(100 /*1s*/);
RTOS_WAIT_MS(100);
moduleState[module].mode = MODULE_MODE_OTA_UPDATE;