piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge with latest 2.3

Browse Source
This commit is contained in:
Bertrand Songis
2020-03-05 10:43:01 +01:00
parent 33b6efc40d ec56892de6
commit 6878ae4a9f
144 changed files with 3009 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/io/multi_firmware_update.cpp
+3 -3
View File
@@ -528,7 +528,7 @@ bool multiFlashFirmware(uint8_t moduleIdx, const char * filename)
pausePulses();
#if defined(INTERNAL_MODULE_MULTI)
#if defined(HARDWARE_INTERNAL_MODULE)
uint8_t intPwr = IS_INTERNAL_MODULE_ON();
INTERNAL_MODULE_OFF();
#endif
@@ -546,7 +546,7 @@ bool multiFlashFirmware(uint8_t moduleIdx, const char * filename)
/* wait 2s off */
watchdogSuspend(500 /*5s*/);
RTOS_WAIT_MS(2000);
RTOS_WAIT_MS(3000);
const char * result = driver->flashFirmware(&file, getBasename(filename));
f_close(&file);
@@ -575,7 +575,7 @@ bool multiFlashFirmware(uint8_t moduleIdx, const char * filename)
// reset telemetry protocol
telemetryInit(255);
#if defined(INTERNAL_MODULE_MULTI)
#if defined(HARDWARE_INTERNAL_MODULE)
if (intPwr) {
INTERNAL_MODULE_ON();
setupPulsesInternalModule();