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

Revert "Fixed the progress bar bug. Improved indentation."

Browse Source 
This reverts commit 91223db338.
This commit is contained in:
Kjell Kernen
2014-03-22 20:09:16 +01:00
parent 91223db338
commit 16155484f9
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/bootloader/boot.cpp
+17 -15
View File
@@ -67,7 +67,7 @@
#include "../translations/en.h"
#if defined(PCBTARANIS)
#define BOOTLOADER_TITLE " OpenTX Boot Loader v1.0"
#define BOOTLOADER_TITLE "Boot Loader - FrSky Taranis"
#define BOOT_KEY_UP KEY_PLUS
#define BOOT_KEY_DOWN KEY_MINUS
#define BOOT_KEY_LEFT KEY_MENU
@@ -571,7 +571,8 @@ int menuFlashFile(uint32_t index, uint8_t event)
{
FRESULT fr;
lcd_putsLeft(4*FH, "\012Hold [ENT] to start loading" );
lcd_putsLeft(2*FH, INDENT "Flash file " FIRMWARES_PATH "/");
lcd_putsnAtt(lcdLastPos, 2*FH, Filenames[index], DISPLAY_CHAR_WIDTH, 0);
if (Valid == 0) {
// Validate file here
@@ -585,13 +586,15 @@ int menuFlashFile(uint32_t index, uint8_t event)
}
if (Valid == 2) {
lcd_putsLeft(4*FH, "\015Not a valid firmware!");
lcd_putsLeft(4*FH, INDENT "Not a valid firmware!");
if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT) || event == EVT_KEY_FIRST(BOOT_KEY_MENU)) {
return 0;
}
return -1;
}
lcd_putsLeft(6*FH, INDENT "[Enter Long] to confirm");
if (event == EVT_KEY_LONG(BOOT_KEY_MENU)) {
fr = openFirmwareFile(index);
FirmwareSize = FileSize[index];
@@ -650,7 +653,7 @@ int main()
#endif
lcd_clear();
lcd_putsLeft(0, BOOTLOADER_TITLE);
lcd_invert_line(0);
lcd_hline(0, 10, LCD_W);
lcdRefresh();
#if defined(PCBSKY9X)
OptrexDisplay = 0;
@@ -711,7 +714,7 @@ int main()
lcd_clear();
lcd_putsLeft(0, BOOTLOADER_TITLE);
lcd_invert_line(0);
lcd_hline(0, 10, LCD_W);
uint8_t event = getEvent();
@@ -720,10 +723,10 @@ int main()
}
if (state == ST_START) {
lcd_putsLeft(2*FH, "\010Load Firmware");
lcd_putsLeft(3*FH, "\010Exit");
lcd_putsLeft(2*FH, "\004Flash a firmware from the SD card");
lcd_putsLeft(3*FH, "\004Exit");
lcd_invert_line(2+vpos);
lcd_putsLeft(6*FH, INDENT "Or plug in a USB cable for mass storage");
lcd_putsLeft(6*FH, INDENT "Or plug a USB cable for Massstorage");
if (event == EVT_KEY_FIRST(BOOT_KEY_DOWN) || event == EVT_KEY_FIRST(BOOT_KEY_UP)) {
vpos = (vpos+1) & 0x01;
}
@@ -736,7 +739,7 @@ int main()
}
if (state == ST_USB) {
lcd_putsLeft(4*FH, "\026USB Connected");
lcd_putsLeft(4*FH, CENTER "\010U S B");
if (usbPlugged() == 0) {
vpos = 0;
state = ST_START;
@@ -871,7 +874,7 @@ int main()
if (state == ST_FLASHING) {
// Commit to flashing
uint32_t blockOffset = 0;
lcd_putsLeft(4*FH, "\032Loading...");
lcd_putsLeft(2*FH, INDENT "Flashing...");
while (BlockCount) {
program((uint32_t *) firmwareAddress, &Block_buffer[blockOffset]); // size is 256 bytes
blockOffset += 64; // 32-bit words (256 bytes)
@@ -883,11 +886,10 @@ int main()
BlockCount = 0;
}
}
firmwareWritten += 8; // 4K blocks
firmwareWritten += 4; // 4K blocks
lcd_rect(INDENT_WIDTH, 6*FH+4, 202, 4);
lcd_hline(INDENT_WIDTH, 6*FH+5, (200*firmwareWritten/(FlashSize-64)), FORCE);
lcd_hline(INDENT_WIDTH, 6*FH+6, (200*firmwareWritten/(FlashSize-64)), FORCE);
lcd_rect(INDENT_WIDTH, 6*FH+4, 202, 3);
lcd_hline(INDENT_WIDTH, 6*FH+5, (200*firmwareWritten/(FlashSize-32)), FORCE);
fr = f_read(&FlashFile, (BYTE *)Block_buffer, sizeof(Block_buffer), &BlockCount);
if (BlockCount == 0) {
@@ -899,7 +901,7 @@ int main()
}
if (state == ST_FLASH_DONE) {
lcd_putsLeft(4*FH, "\024Loading Complete");
lcd_putsLeft(2*FH, INDENT "Flashing Complete");
if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT) || event == EVT_KEY_FIRST(BOOT_KEY_MENU)) {
state = ST_START;
vpos = 0;