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
+5
View File
@@ -536,6 +536,7 @@ bool multiFlashFirmware(uint8_t moduleIdx, const char * filename)
uint8_t extPwr = IS_EXTERNAL_MODULE_ON();
EXTERNAL_MODULE_OFF();
uint8_t spuPwr = IS_SPORT_UPDATE_POWER_ON();
SPORT_UPDATE_POWER_OFF();
#if defined(COLORLCD)
@@ -587,6 +588,10 @@ bool multiFlashFirmware(uint8_t moduleIdx, const char * filename)
setupPulsesExternalModule();
}
if (spuPwr) {
SPORT_UPDATE_POWER_ON();
}
resumePulses();
return result == nullptr;