fix: Flashing internal ISRM and via S.PORT connector (#3374)
* fix: re-enabled flashing via S.PORT connector * fix: remove check for productId on internal module
This commit is contained in:
@@ -256,11 +256,12 @@ void RadioSdManagerPage::fileAction(const char* path, const char* name,
|
|||||||
[=]() { BootloaderUpdate(fullpath); });
|
[=]() { BootloaderUpdate(fullpath); });
|
||||||
}
|
}
|
||||||
} else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
|
} else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
|
||||||
// TODO
|
|
||||||
// if (HAS_SPORT_UPDATE_CONNECTOR()) {
|
auto mod_desc = modulePortGetModuleDescription(SPORT_MODULE);
|
||||||
// menu->addLine(STR_FLASH_EXTERNAL_DEVICE,
|
if (mod_desc && mod_desc->set_pwr) {
|
||||||
// [=]() { FrSkyFirmwareUpdate(fullpath, SPORT_MODULE); });
|
menu->addLine(STR_FLASH_EXTERNAL_DEVICE,
|
||||||
// }
|
[=]() { FrSkyFirmwareUpdate(fullpath, SPORT_MODULE); });
|
||||||
|
}
|
||||||
menu->addLine(STR_FLASH_INTERNAL_MODULE,
|
menu->addLine(STR_FLASH_INTERNAL_MODULE,
|
||||||
[=]() { FrSkyFirmwareUpdate(fullpath, INTERNAL_MODULE); });
|
[=]() { FrSkyFirmwareUpdate(fullpath, INTERNAL_MODULE); });
|
||||||
menu->addLine(STR_FLASH_EXTERNAL_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 ||
|
if (information.productFamily == FIRMWARE_FAMILY_RECEIVER ||
|
||||||
information.productFamily == FIRMWARE_FAMILY_SENSOR) {
|
information.productFamily == FIRMWARE_FAMILY_SENSOR) {
|
||||||
// if (HAS_SPORT_UPDATE_CONNECTOR()) {
|
|
||||||
// menu->addLine(STR_FLASH_EXTERNAL_DEVICE, [=]() {
|
auto mod_desc = modulePortGetModuleDescription(SPORT_MODULE);
|
||||||
// FrSkyFirmwareUpdate(fullpath, SPORT_MODULE);
|
if (mod_desc && mod_desc->set_pwr) {
|
||||||
// });
|
menu->addLine(STR_FLASH_EXTERNAL_DEVICE, [=]() {
|
||||||
// } else {
|
FrSkyFirmwareUpdate(fullpath, SPORT_MODULE);
|
||||||
menu->addLine(STR_FLASH_EXTERNAL_MODULE, [=]() {
|
});
|
||||||
FrSkyFirmwareUpdate(fullpath, EXTERNAL_MODULE);
|
} else {
|
||||||
});
|
menu->addLine(STR_FLASH_EXTERNAL_MODULE, [=]() {
|
||||||
// }
|
FrSkyFirmwareUpdate(fullpath, EXTERNAL_MODULE);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#if _NYI_ // Not yet implemented
|
#if _NYI_ // Not yet implemented
|
||||||
#if defined(PXX2)
|
#if defined(PXX2)
|
||||||
|
|||||||
@@ -315,8 +315,7 @@ const char *FrskyDeviceFirmwareUpdate::doFlashFirmware(
|
|||||||
return STR_DEVICE_FILE_WRONG_SIG;
|
return STR_DEVICE_FILE_WRONG_SIG;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (information.productFamily == FIRMWARE_FAMILY_INTERNAL_MODULE &&
|
if (information.productFamily == FIRMWARE_FAMILY_INTERNAL_MODULE) {
|
||||||
information.productId == FIRMWARE_ID_MODULE_ISRM) {
|
|
||||||
port = ETX_MOD_PORT_UART;
|
port = ETX_MOD_PORT_UART;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user