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

* 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
+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)
+17 -17
View File
@@ -265,21 +265,21 @@ const char * MultiFirmwareUpdateDriver::waitForInitialSync(bool & inverted) cons
} while ((byte != STK_INSYNC) && --retries);
if (!retries) {
return "NoSync";
return STR_DEVICE_NO_RESPONSE;
}
if (byte != STK_INSYNC) {
#if defined(DEBUG_EXT_MODULE_FLASH)
TRACE("[byte != STK_INSYNC]");
#endif
return "NoSync";
return STR_DEVICE_NO_RESPONSE;
}
if (!checkRxByte(STK_OK)) {
#if defined(DEBUG_EXT_MODULE_FLASH)
TRACE("[!checkRxByte(STK_OK)]");
#endif
return "NoSync";
return STR_DEVICE_NO_RESPONSE;
}
// avoids sending STK_READ_SIGN with STK_OK
@@ -298,11 +298,11 @@ const char * MultiFirmwareUpdateDriver::getDeviceSignature(uint8_t * signature)
clear();
if (!checkRxByte(STK_INSYNC))
return "NoSync";
return STR_DEVICE_NO_RESPONSE;
for (uint8_t i = 0; i < 4; i++) {
if (!getRxByte(signature[i])) {
return "NoSignature";
return STR_DEVICE_FILE_WRONG_SIG;
}
}
@@ -317,7 +317,7 @@ const char * MultiFirmwareUpdateDriver::loadAddress(uint32_t offset) const
sendByte(CRC_EOP);
if (!checkRxByte(STK_INSYNC) || !checkRxByte(STK_OK)) {
return "NoSync";
return STR_DEVICE_NO_RESPONSE;
}
// avoids sending next page back-to-back with STK_OK
@@ -345,7 +345,7 @@ const char * MultiFirmwareUpdateDriver::progPage(uint8_t * buffer, uint16_t size
sendByte(CRC_EOP);
if (!checkRxByte(STK_INSYNC))
return "NoSync";
return STR_DEVICE_NO_RESPONSE;
uint8_t byte;
uint8_t retries = 4;
@@ -355,7 +355,7 @@ const char * MultiFirmwareUpdateDriver::progPage(uint8_t * buffer, uint16_t size
} while (!byte && --retries);
if (!retries || (byte != STK_OK))
return "NoPageSync";
return STR_DEVICE_WRONG_REQUEST;
return nullptr;
}
@@ -410,7 +410,7 @@ const char * MultiFirmwareUpdateDriver::flashFirmware(FIL * file, const char * l
if (signature[0] != 0x1E) {
leaveProgMode(inverted);
return "Wrong signature";
return STR_DEVICE_FILE_WRONG_SIG;
}
if (signature[1] == 0x55 && signature[2] == 0xAA) {
@@ -424,7 +424,7 @@ const char * MultiFirmwareUpdateDriver::flashFirmware(FIL * file, const char * l
UINT count = 0;
memclear(buffer, pageSize);
if (f_read(file, buffer, pageSize, &count) != FR_OK) {
result = "Error reading file";
result = STR_DEVICE_FILE_ERROR;
break;
}
@@ -471,7 +471,7 @@ const char * MultiFirmwareInformation::readV1Signature(const char * buffer)
else if (!memcmp(buffer, "multi-orx", 9))
boardType = FIRMWARE_MULTI_ORX;
else
return "Wrong format";
return STR_DEVICE_FILE_WRONG_SIG;
if (buffer[MULTI_SIGN_BOOTLOADER_SUPPORT_OFFSET] == 'b')
optibootSupport = true;
@@ -519,7 +519,7 @@ const char * MultiFirmwareInformation::readV2Signature(const char * buffer)
}
if (cursor - beg < 8)
return "Invalid signature";
return STR_DEVICE_FILE_WRONG_SIG;
boardType = options & 0x3;
optibootSupport = options & 0x80 ? true : false;
@@ -539,7 +539,7 @@ const char * MultiFirmwareInformation::readMultiFirmwareInformation(const char *
{
FIL file;
if (f_open(&file, filename, FA_READ) != FR_OK)
return "Error opening file";
return STR_DEVICE_FILE_ERROR;
const char * err = readMultiFirmwareInformation(&file);
f_close(&file);
@@ -553,11 +553,11 @@ const char * MultiFirmwareInformation::readMultiFirmwareInformation(FIL * file)
UINT count;
if (f_size(file) < MULTI_SIGN_SIZE)
return "File too small";
return STR_DEVICE_FILE_ERROR;
f_lseek(file, f_size(file) - MULTI_SIGN_SIZE);
if (f_read(file, buffer, MULTI_SIGN_SIZE, &count) != FR_OK || count != MULTI_SIGN_SIZE) {
return "Error reading file";
return STR_DEVICE_FILE_ERROR;
}
if (!memcmp(buffer, "multi-x", 7)) {
@@ -572,7 +572,7 @@ bool MultiDeviceFirmwareUpdate::flashFirmware(const char * filename, ProgressHan
FIL file;
if (f_open(&file, filename, FA_READ) != FR_OK) {
POPUP_WARNING("Not a valid file");
POPUP_WARNING(STR_DEVICE_FILE_ERROR);
return false;
}
@@ -580,7 +580,7 @@ bool MultiDeviceFirmwareUpdate::flashFirmware(const char * filename, ProgressHan
MultiFirmwareInformation firmwareFile;
if (firmwareFile.readMultiFirmwareInformation(&file)) {
f_close(&file);
POPUP_WARNING("Not a valid file");
POPUP_WARNING(STR_DEVICE_FILE_ERROR);
return false;
}
f_lseek(&file, 0);