Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 01:05:10 +03:00
Code Issues Wiki Activity

OTA update fix

Browse source
This commit is contained in:
Bertrand Songis 2019-06-14 09:50:48 +02:00
parent ce6bf053b8
commit c28501fe46
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/io/frsky_firmware_update.cpp
View file

@ -299,7 +299,7 @@ const char * FrskyDeviceFirmwareUpdate::uploadFile(const char * filename)
const char * ext = getFileExtension(filename);
if (ext && !strcasecmp(ext, UPDATE_FIRMWARE_EXT)) {
// FrSkyFirmwareInformation *information = (FrSkyFirmwareInformation *) buffer;
// FrSkyFirmwareInformation * information = (FrSkyFirmwareInformation *) buffer;
if (f_read(&file, buffer, sizeof(FrSkyFirmwareInformation), &count) != FR_OK || count != sizeof(FrSkyFirmwareInformation)) {
f_close(&file);
return "Format error";

16
radio/src/pulses/pxx2.cpp
View file

@ -20,6 +20,7 @@
#include "opentx.h"
#include "pulses/pxx2.h"
#include "io/frsky_firmware_update.h"
uint8_t Pxx2Pulses::addFlag0(uint8_t module)
{
@ -452,7 +453,20 @@ const char * Pxx2OtaUpdate::doFlashFirmware(const char * filename)
return "Open file failed";
}
uint32_t size = f_size(&file);
uint32_t size;
const char * ext = getFileExtension(filename);
if (ext && !strcasecmp(ext, UPDATE_FIRMWARE_EXT)) {
FrSkyFirmwareInformation * information = (FrSkyFirmwareInformation *) buffer;
if (f_read(&file, buffer, sizeof(FrSkyFirmwareInformation), &count) != FR_OK || count != sizeof(FrSkyFirmwareInformation)) {
f_close(&file);
return "Format error";
}
size = information->size;
}
else {
size = f_size(&file);
}
uint32_t done = 0;
while (1) {
drawProgressScreen(getBasename(filename), STR_OTA_UPDATE, done, size);