Merge with latest 2.3

This commit is contained in:
Bertrand Songis
2020-03-18 17:09:38 +01:00
52 changed files with 514 additions and 295 deletions
+10
View File
@@ -488,6 +488,7 @@ const char * FrskyDeviceFirmwareUpdate::flashFirmware(const char * filename, Pro
uint8_t extPwr = IS_EXTERNAL_MODULE_ON();
EXTERNAL_MODULE_OFF();
uint8_t spuPwr = IS_SPORT_UPDATE_POWER_ON();
SPORT_UPDATE_POWER_OFF();
progressHandler(getBasename(filename), STR_DEVICE_RESET, 0, 0);
@@ -532,6 +533,10 @@ const char * FrskyDeviceFirmwareUpdate::flashFirmware(const char * filename, Pro
setupPulsesExternalModule();
}
if (spuPwr) {
SPORT_UPDATE_POWER_ON();
}
state = SPORT_IDLE;
resumePulses();
@@ -753,6 +758,7 @@ const char * FrskyChipFirmwareUpdate::flashFirmware(const char * filename, Progr
uint8_t extPwr = IS_EXTERNAL_MODULE_ON();
EXTERNAL_MODULE_OFF();
uint8_t spuPwr = IS_SPORT_UPDATE_POWER_ON();
SPORT_UPDATE_POWER_OFF();
if (wait) {
@@ -792,6 +798,10 @@ const char * FrskyChipFirmwareUpdate::flashFirmware(const char * filename, Progr
setupPulsesExternalModule();
}
if (spuPwr) {
SPORT_UPDATE_POWER_ON();
}
resumePulses();
return result;