Bootloader cosmetics
This commit is contained in:
@@ -117,10 +117,10 @@ FRESULT openBinFile(MemoryType mt, unsigned int index)
|
||||
|
||||
void extractFirmwareVersion(VersionTag* tag)
|
||||
{
|
||||
const char* vers = getOtherVersion((char*)Block_buffer);
|
||||
const char * vers = getFirmwareVersion((const char *)Block_buffer);
|
||||
if (!vers || (vers[0] == 'n' && vers[1] == 'o')) { // "no version found"
|
||||
memcpy(tag->flavour, "unknown", sizeof("unknown"));
|
||||
tag->version = "unknown";
|
||||
memcpy(tag->flavour, "unknown", sizeof("unknown"));
|
||||
tag->version = "unknown";
|
||||
}
|
||||
|
||||
// skip "opentx-"
|
||||
|
||||
@@ -34,12 +34,12 @@
|
||||
#if LCD_W >= 480
|
||||
#define STR_INVALID_FIRMWARE "Not a valid firmware file"
|
||||
#elif LCD_W >= 212
|
||||
#define STR_OR_PLUGIN_USB_CABLE INDENT "Or plug in a USB cable for mass storage"
|
||||
#define STR_OR_PLUGIN_USB_CABLE "Or plug in a USB cable for mass storage"
|
||||
#define STR_HOLD_ENTER_TO_START "\012Hold [ENT] to start writing"
|
||||
#define STR_INVALID_FIRMWARE "\011Not a valid firmware file! "
|
||||
#define STR_INVALID_EEPROM "\011Not a valid EEPROM file! "
|
||||
#else
|
||||
#define STR_OR_PLUGIN_USB_CABLE INDENT "Or plug in a USB cable"
|
||||
#define STR_OR_PLUGIN_USB_CABLE "Or plug in a USB cable"
|
||||
#define STR_HOLD_ENTER_TO_START "\006Hold [ENT] to start"
|
||||
#define STR_INVALID_FIRMWARE "\004Not a valid firmware! "
|
||||
#define STR_INVALID_EEPROM "\004Not a valid EEPROM! "
|
||||
|
||||
@@ -408,7 +408,7 @@ const FATDirEntry_t g_DIRroot[] =
|
||||
0xA302,
|
||||
0x3D55,
|
||||
0x0002,
|
||||
sizeof(firmware_txt) + strlen(getOtherVersion(nullptr))
|
||||
sizeof(firmware_txt) + strlen(getFirmwareVersion())
|
||||
},
|
||||
{
|
||||
{ 'F', 'I', 'R', 'M', 'W', 'A', 'R', 'E'},
|
||||
@@ -512,13 +512,11 @@ int32_t fat12Read(uint8_t * buffer, uint16_t sector, uint16_t count)
|
||||
else if (sector == 3) {
|
||||
memcpy(buffer, g_DIRroot, sizeof(g_DIRroot) ) ;
|
||||
}
|
||||
else if (sector == 4)
|
||||
{
|
||||
else if (sector == 4) {
|
||||
memcpy(buffer, firmware_txt, sizeof(firmware_txt));
|
||||
memcpy(buffer + sizeof(firmware_txt), getOtherVersion(nullptr), strlen(getOtherVersion(nullptr)));
|
||||
strcpy((char *)(buffer + sizeof(firmware_txt)), getFirmwareVersion());
|
||||
}
|
||||
else if (sector < RESERVED_SECTORS)
|
||||
{
|
||||
else if (sector < RESERVED_SECTORS) {
|
||||
// allocated to firmware.txt
|
||||
}
|
||||
else if (sector < RESERVED_SECTORS + (FLASHSIZE/BLOCK_SIZE )) {
|
||||
|
||||
@@ -84,7 +84,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
|
||||
|
||||
bootloaderDrawFooter();
|
||||
lcdDrawText( 36, 242, "Current Firmware:");
|
||||
lcdDrawText(200, 242, getOtherVersion(nullptr));
|
||||
lcdDrawText(200, 242, getFirmwareVersion());
|
||||
}
|
||||
else if (st == ST_USB) {
|
||||
|
||||
|
||||
@@ -21,28 +21,25 @@ void bootloaderDrawFilename(const char *str, uint8_t line, bool selected)
|
||||
void bootloaderDrawScreen(BootloaderState st, int opt, const char *str)
|
||||
{
|
||||
lcdClear();
|
||||
lcdDrawText(0, 0, BOOTLOADER_TITLE, INVERS);
|
||||
lcdDrawText(LCD_W / 2, 0, BOOTLOADER_TITLE, CENTERED);
|
||||
lcdInvertLine(0);
|
||||
|
||||
if (st == ST_START) {
|
||||
lcdDrawTextAlignedLeft(2*FH, "\010Write Firmware");
|
||||
lcdDrawTextAlignedLeft(3*FH, "\010Restore EEPROM");
|
||||
lcdDrawTextAlignedLeft(4*FH, "\010Exit");
|
||||
|
||||
#if LCD_W >= 212
|
||||
lcdDrawTextAlignedLeft(6*FH, "\001Curr FW:");
|
||||
lcdDrawText(50, 6*FH, getOtherVersion(nullptr));
|
||||
#else
|
||||
lcdDrawTextAlignedLeft(6 * FH, "\001FW:");
|
||||
|
||||
// Remove opentx- from string
|
||||
const char *other_ver = getOtherVersion(nullptr);
|
||||
if (strstr(other_ver, "opentx-"))
|
||||
other_ver = other_ver + 7;
|
||||
lcdDrawText(20, 6 * FH, other_ver);
|
||||
#endif
|
||||
|
||||
lcdInvertLine(2 + opt);
|
||||
lcdDrawTextAlignedLeft(7 * FH, STR_OR_PLUGIN_USB_CABLE);
|
||||
|
||||
lcdDrawText(LCD_W / 2, 5 * FH + FH / 2, STR_OR_PLUGIN_USB_CABLE, CENTERED);
|
||||
|
||||
// Remove "opentx-" from string
|
||||
const char * vers = getFirmwareVersion();
|
||||
#if LCD_W < 212
|
||||
if (strncmp(vers, "opentx-", 7) == 0)
|
||||
vers += 7;
|
||||
#endif
|
||||
lcdDrawText(LCD_W / 2, 7 * FH, vers, CENTERED);
|
||||
lcdInvertLine(7);
|
||||
}
|
||||
else if (st == ST_USB) {
|
||||
lcdDrawTextAlignedLeft(4 * FH, STR_USB_CONNECTED);
|
||||
@@ -65,11 +62,11 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char *str)
|
||||
}
|
||||
else if (opt == FC_OK) {
|
||||
if (memoryType == MEM_FLASH) {
|
||||
const char * vers = getOtherVersion((char *) Block_buffer);
|
||||
const char * vers = getFirmwareVersion((const char *)Block_buffer);
|
||||
#if LCD_W < 212
|
||||
// Remove opentx- from string
|
||||
if (strstr(vers, "opentx-"))
|
||||
vers = vers + 7;
|
||||
// Remove "opentx-" from string
|
||||
if (strncmp(vers, "opentx-", 7) == 0)
|
||||
vers += 7;
|
||||
#endif
|
||||
bootloaderDrawMsg(INDENT_WIDTH, vers, 0, false);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user