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

chore: Replace fixed strings with translation for device-flash-dialogs (#1372)

Browse Source 
* replaced fix strings with translations

* additional strings

* replaced wrong german string to english in all but german translations

* fixed spelling
This commit is contained in:
Wilhelm
2022-02-11 10:27:05 +10:00
committed by GitHub
parent c725508876
commit 67d4a29e31
17 changed files with 142 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/io/frsky_firmware_update.cpp
+25 -24
View File
@@ -22,6 +22,7 @@
#include <stdio.h>
#include "opentx.h"
#include "frsky_firmware_update.h"
#include "debug.h"
#if defined(LIBOPENUI)
#include "libopenui.h"
@@ -51,23 +52,23 @@ const char * readFrSkyFirmwareInformation(const char * filename, FrSkyFirmwareIn
UINT count;
if (f_open(&file, filename, FA_READ) != FR_OK) {
return "Error opening file";
return STR_NEEDS_FILE;
}
if (f_read(&file, &data, sizeof(data), &count) != FR_OK || count != sizeof(data)) {
f_close(&file);
return "Error reading file";
return STR_DEVICE_FILE_ERROR;
}
uint32_t size = f_size(&file);
f_close(&file);
if (data.headerVersion != 1 && data.fourcc != 0x4B535246) {
return "Wrong format";
return STR_DEVICE_FILE_ERROR;
}
if (size != sizeof(data) + data.size) {
return "Wrong size";
return STR_DEVICE_FILE_ERROR;
}
return nullptr;
@@ -274,14 +275,14 @@ const char * FrskyDeviceFirmwareUpdate::sendPowerOn()
}
if (telemetryProtocol != PROTOCOL_TELEMETRY_FRSKY_SPORT) {
return TR("Not responding", "Not S.Port 1");
return STR_DEVICE_NO_RESPONSE;
}
if (!IS_FRSKY_SPORT_PROTOCOL()) {
return TR("Not responding", "Not S.Port 2");
return STR_DEVICE_NO_RESPONSE;
}
return TR("Not responding", "Device not responding");
return STR_DEVICE_NO_RESPONSE;
}
const char * FrskyDeviceFirmwareUpdate::sendReqVersion()
@@ -313,14 +314,14 @@ const char * FrskyDeviceFirmwareUpdate::doFlashFirmware(const char * filename, P
UINT count;
if (f_open(&file, filename, FA_READ) != FR_OK) {
return "Error opening file";
return STR_NEEDS_FILE;
}
const char * ext = getFileExtension(filename);
if (ext && !strcasecmp(ext, FRSKY_FIRMWARE_EXT)) {
if (f_read(&file, &information, sizeof(FrSkyFirmwareInformation), &count) != FR_OK || count != sizeof(FrSkyFirmwareInformation)) {
f_close(&file);
return "Format error";
return STR_DEVICE_FILE_ERROR;
}
}
else {
@@ -383,14 +384,14 @@ const char * FrskyDeviceFirmwareUpdate::uploadFileToHorusXJT(const char * filena
uint8_t frame[8];
if (!readBuffer(frame, 8, 100) || frame[0] != 0x01) {
return TR("Not responding", "Device not responding");
return STR_DEVICE_NO_RESPONSE;
}
intmoduleSendByte(0x81);
readBuffer(frame, 1, 100);
if (!readBuffer(frame, 8, 100) || frame[0] != 0x02) {
return TR("Not responding", "Device not responding");
return STR_DEVICE_NO_RESPONSE;
}
intmoduleSendByte(0x82);
@@ -401,14 +402,14 @@ const char * FrskyDeviceFirmwareUpdate::uploadFileToHorusXJT(const char * filena
progressHandler(getBasename(filename), STR_WRITING, file->fptr, file->obj.objsize);
if (f_read(file, buffer, 1024, &count) != FR_OK) {
return "Error reading file";
return STR_DEVICE_FILE_ERROR;
}
if (!readBuffer(frame, 2, 100))
return "Data refused";
return STR_DEVICE_DATA_REFUSED;
if (frame[0] != 0x11 || frame[1] != index)
return "Wrong request";
return STR_DEVICE_WRONG_REQUEST;
if (count == 0) {
intmoduleSendByte(0xA1);
@@ -456,14 +457,14 @@ const char * FrskyDeviceFirmwareUpdate::uploadFileNormal(const char * filename,
while (true) {
if (f_read(file, buffer, 1024, &count) != FR_OK) {
return "Error reading file";
return STR_DEVICE_FILE_ERROR;
}
count >>= 2;
for (uint32_t i=0; i<count; i++) {
if (!waitState(SPORT_DATA_REQ, 2000)) {
return "Data refused";
return STR_DEVICE_DATA_REFUSED;
}
startFrame(PRIM_DATA_WORD);
uint32_t offset = (address & 1023) >> 2; // 32 bit word offset into buffer
@@ -487,11 +488,11 @@ const char * FrskyDeviceFirmwareUpdate::uploadFileNormal(const char * filename,
const char * FrskyDeviceFirmwareUpdate::endTransfer()
{
if (!waitState(SPORT_DATA_REQ, 2000))
return "Data refused";
return STR_DEVICE_DATA_REFUSED;
startFrame(PRIM_DATA_EOF);
sendFrame();
if (!waitState(SPORT_COMPLETE, 2000)) {
return "Firmware rejected";
return STR_DEVICE_FILE_REJECTED;
}
return nullptr;
}
@@ -592,7 +593,7 @@ const char * FrskyChipFirmwareUpdate::waitAnswer(uint8_t & status)
break;
}
if (++retry == CHIP_FIRMWARE_UPDATE_TIMEOUT) {
return "No answer";
return STR_DEVICE_NO_RESPONSE;
}
RTOS_WAIT_MS(1);
}
@@ -679,7 +680,7 @@ const char * FrskyChipFirmwareUpdate::sendUpgradeCommand(char command, uint32_t
if (result)
return result;
return status == 0x00 ? nullptr : "Upgrade failed";
return status == 0x00 ? nullptr : STR_FIRMWARE_UPDATE_ERROR;
}
const char * FrskyChipFirmwareUpdate::sendUpgradeData(uint32_t index, uint8_t * data)
@@ -720,7 +721,7 @@ const char * FrskyChipFirmwareUpdate::sendUpgradeData(uint32_t index, uint8_t *
if (result)
return result;
return status == 0x00 ? nullptr : "Upgrade failed";
return status == 0x00 ? nullptr : STR_FIRMWARE_UPDATE_ERROR;
}
const char * FrskyChipFirmwareUpdate::doFlashFirmware(const char * filename, ProgressHandler progressHandler)
@@ -735,13 +736,13 @@ const char * FrskyChipFirmwareUpdate::doFlashFirmware(const char * filename, Pro
return result;
if (f_open(&file, filename, FA_READ) != FR_OK) {
return "Error opening file";
return STR_NEEDS_FILE;
}
FrSkyFirmwareInformation * information = (FrSkyFirmwareInformation *)buffer;
if (f_read(&file, buffer, sizeof(FrSkyFirmwareInformation), &count) != FR_OK || count != sizeof(FrSkyFirmwareInformation)) {
f_close(&file);
return "Format error";
return STR_DEVICE_FILE_ERROR;
}
uint32_t packetsCount = (information->size + sizeof(buffer) - 1) / sizeof(buffer);
@@ -756,7 +757,7 @@ const char * FrskyChipFirmwareUpdate::doFlashFirmware(const char * filename, Pro
progressHandler(getBasename(filename), STR_FLASH_WRITE, index, packetsCount);
if (f_read(&file, buffer, sizeof(buffer), &count) != FR_OK) {
f_close(&file);
return "Error reading file";
return STR_DEVICE_FILE_ERROR;
}
result = sendUpgradeData(index + 1, buffer);
if (result)