Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-23 16:25:12 +03:00
Code Activity

Cosmetics

Browse source
This commit is contained in:
Andre Bernet 2014-04-08 23:32:30 +02:00
parent a84427e260
commit 2a337543d6
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/bootloader/boot.cpp
View file

@ -63,7 +63,7 @@
#include "../translations/en.h" #include "../translations/en.h"
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define BOOTLOADER_TITLE " Taranis Boot Loader - v1.0" #define BOOTLOADER_TITLE " Taranis BootLoader - v1.0"
#define BOOT_KEY_UP KEY_PLUS #define BOOT_KEY_UP KEY_PLUS
#define BOOT_KEY_DOWN KEY_MINUS #define BOOT_KEY_DOWN KEY_MINUS
#define BOOT_KEY_LEFT KEY_MENU #define BOOT_KEY_LEFT KEY_MENU
@ -500,7 +500,7 @@ int main()
} }
if (state == ST_START) { if (state == ST_START) {
lcd_putsLeft(2*FH, "\010Load Firmware"); lcd_putsLeft(2*FH, "\010Write Firmware");
lcd_putsLeft(3*FH, "\010Exit"); lcd_putsLeft(3*FH, "\010Exit");
lcd_invert_line(2+vpos); 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 in a USB cable for mass storage");
@ -647,7 +647,7 @@ int main()
if (state == ST_FLASHING) { if (state == ST_FLASHING) {
// Commit to flashing // Commit to flashing
uint32_t blockOffset = 0; uint32_t blockOffset = 0;
lcd_putsLeft(4*FH, "\032Loading..."); lcd_putsLeft(4*FH, "\032Writing...");
if (firmwareAddress == FIRMWARE_ADDRESS + BOOTLOADER_SIZE) { if (firmwareAddress == FIRMWARE_ADDRESS + BOOTLOADER_SIZE) {
if (!isFirmwareStart(Block_buffer)) { if (!isFirmwareStart(Block_buffer)) {
@ -684,7 +684,7 @@ int main()
} }
if (state == ST_FLASH_DONE) { if (state == ST_FLASH_DONE) {
lcd_putsLeft(4*FH, "\024Loading Complete"); lcd_putsLeft(4*FH, "\024Writing Complete");
if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT) || event == EVT_KEY_BREAK(BOOT_KEY_MENU)) { if (event == EVT_KEY_FIRST(BOOT_KEY_EXIT) || event == EVT_KEY_BREAK(BOOT_KEY_MENU)) {
state = ST_START; state = ST_START;
vpos = 0; vpos = 0;

2
radio/src/gui/menu_general.cpp
View file

@ -692,6 +692,8 @@ void flashBootloader(const char * filename)
f_open(&file, filename, FA_READ); f_open(&file, filename, FA_READ);
uint8_t buffer[1024]; uint8_t buffer[1024];
UINT count; UINT count;
lcd_clear();
lcd_putsLeft(4*FH, "\032Writing...");
lcd_rect(3, 6*FH+4, 204, 7); lcd_rect(3, 6*FH+4, 204, 7);
watchdogSetTimeout(1000/*10s*/); watchdogSetTimeout(1000/*10s*/);