Merge with latest 2.3

This commit is contained in:
Bertrand Songis
2019-11-07 15:04:45 +01:00
286 changed files with 9956 additions and 10363 deletions
+26 -3
View File
@@ -360,10 +360,31 @@ void Pxx2Pulses::sendOtaUpdate(uint8_t module, const char * rxName, uint32_t add
extmoduleSendNextFrame();
}
void Pxx2Pulses::setupFrame(uint8_t module)
void Pxx2Pulses::setupAuthenticationFrame(uint8_t module, uint8_t mode, const uint8_t * outputMessage)
{
initFrame();
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_AUTHENTICATION);
Pxx2Transport::addByte(mode);
if (outputMessage) {
for (uint8_t i = 0; i < 16; i++) {
Pxx2Transport::addByte(outputMessage[i]);
}
}
endFrame();
}
bool Pxx2Pulses::setupFrame(uint8_t module)
{
if (moduleState[module].mode == MODULE_MODE_OTA_UPDATE)
return;
return false;
if (moduleState[module].mode == MODULE_MODE_AUTHENTICATION) {
moduleState[module].mode = MODULE_MODE_NORMAL;
return false;
}
initFrame();
@@ -416,6 +437,8 @@ void Pxx2Pulses::setupFrame(uint8_t module)
}
endFrame();
return true;
}
bool Pxx2OtaUpdate::waitStep(uint8_t step, uint8_t timeout)
@@ -472,7 +495,7 @@ const char * Pxx2OtaUpdate::doFlashFirmware(const char * filename, ProgressHandl
uint32_t size;
const char * ext = getFileExtension(filename);
if (ext && !strcasecmp(ext, UPDATE_FIRMWARE_EXT)) {
if (ext && !strcasecmp(ext, FRSKY_FIRMWARE_EXT)) {
FrSkyFirmwareInformation * information = (FrSkyFirmwareInformation *) buffer;
if (f_read(&file, buffer, sizeof(FrSkyFirmwareInformation), &count) != FR_OK || count != sizeof(FrSkyFirmwareInformation)) {
f_close(&file);