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

fix: Flashing internal ISRM and via S.PORT connector (#3374)

Browse Source 
* fix: re-enabled flashing via S.PORT connector

* fix: remove check for productId on internal module
This commit is contained in:
Raphael Coeffic
2023-03-26 11:30:01 +10:00
committed by GitHub
parent e016598b56
commit cb43cf75b9
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_sdmanager.cpp
+17 -14
View File
@@ -256,11 +256,12 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name,
[=]() { BootloaderUpdate(fullpath); });
}
} else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
// TODO
// if (HAS_SPORT_UPDATE_CONNECTOR()) {
// menu->addLine(STR_FLASH_EXTERNAL_DEVICE,
// [=]() { FrSkyFirmwareUpdate(fullpath, SPORT_MODULE); });
// }
auto mod_desc = modulePortGetModuleDescription(SPORT_MODULE);
if (mod_desc && mod_desc->set_pwr) {
menu->addLine(STR_FLASH_EXTERNAL_DEVICE,
[=]() { FrSkyFirmwareUpdate(fullpath, SPORT_MODULE); });
}
menu->addLine(STR_FLASH_INTERNAL_MODULE,
[=]() { FrSkyFirmwareUpdate(fullpath, INTERNAL_MODULE); });
menu->addLine(STR_FLASH_EXTERNAL_MODULE,
@@ -281,15 +282,17 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name,
}
if (information.productFamily == FIRMWARE_FAMILY_RECEIVER ||
information.productFamily == FIRMWARE_FAMILY_SENSOR) {
// if (HAS_SPORT_UPDATE_CONNECTOR()) {
// menu->addLine(STR_FLASH_EXTERNAL_DEVICE, [=]() {
// FrSkyFirmwareUpdate(fullpath, SPORT_MODULE);
// });
// } else {
menu->addLine(STR_FLASH_EXTERNAL_MODULE, [=]() {
FrSkyFirmwareUpdate(fullpath, EXTERNAL_MODULE);
});
// }
auto mod_desc = modulePortGetModuleDescription(SPORT_MODULE);
if (mod_desc && mod_desc->set_pwr) {
menu->addLine(STR_FLASH_EXTERNAL_DEVICE, [=]() {
FrSkyFirmwareUpdate(fullpath, SPORT_MODULE);
});
} else {
menu->addLine(STR_FLASH_EXTERNAL_MODULE, [=]() {
FrSkyFirmwareUpdate(fullpath, EXTERNAL_MODULE);
});
}
}
#if _NYI_ // Not yet implemented
#if defined(PXX2)
radio/src/io/frsky_firmware_update.cpp
+1 -2
View File
@@ -315,8 +315,7 @@ const char *FrskyDeviceFirmwareUpdate::doFlashFirmware(
return STR_DEVICE_FILE_WRONG_SIG;
}
if (information.productFamily == FIRMWARE_FAMILY_INTERNAL_MODULE &&
information.productId == FIRMWARE_ID_MODULE_ISRM) {
if (information.productFamily == FIRMWARE_FAMILY_INTERNAL_MODULE) {
port = ETX_MOD_PORT_UART;
}