diff --git a/ui/welcome.c b/ui/welcome.c index 3cd9f7b..bcc37e2 100644 --- a/ui/welcome.c +++ b/ui/welcome.c @@ -27,59 +27,59 @@ #include "ui/status.h" #include "version.h" #include "driver/system.h" -void UI_DisplayReleaseKeys(BOOT_Mode_t BootMode) { - memset(gStatusLine, 0, sizeof(gStatusLine)); - memset(gFrameBuffer, 0, sizeof(gFrameBuffer)); - - if (BootMode == BOOT_MODE_F_LOCK) { - //解锁,全部按键 - UI_PrintStringSmall(解锁, 0, 127, 1); - UI_PrintStringSmall(全部按键, 0, 127, 3); - ST7565_BlitStatusLine(); // blank status line - ST7565_BlitFullScreen(); - } - - -} - -void UI_DisplayWelcome(void) { - BACKLIGHT_TurnOn(); - - char WelcomeString0[16]={0}; - char WelcomeString1[16]={0}; - - memset(gStatusLine, 0, sizeof(gStatusLine)); - memset(gFrameBuffer, 0, sizeof(gFrameBuffer)); - - - - -# - - EEPROM_ReadBuffer(0x0EB0, WelcomeString0, 16); - EEPROM_ReadBuffer(0x0EC0, WelcomeString1, 16); - - - UI_PrintStringSmall(WelcomeString0, 0, 127, 0); - UI_PrintStringSmall(WelcomeString1, 0, 127, 2); - sprintf(WelcomeString1, "%u.%02uV %u%%", - gBatteryVoltageAverage / 100, - gBatteryVoltageAverage % 100, - BATTERY_VoltsToPercent(gBatteryVoltageAverage)); - UI_PrintStringSmall(WelcomeString1, 0, 127, 4); - - UI_PrintStringSmall(Version, 0, 127, 6); - - ST7565_BlitStatusLine(); // blank status line - ST7565_BlitFullScreen(); - unsigned char i=250; - while (i--) { - if (KEYBOARD_Poll() == KEY_EXIT) - break; - SYSTEM_DelayMs(10); - - - } - -} +//void UI_DisplayReleaseKeys(BOOT_Mode_t BootMode) { +// memset(gStatusLine, 0, sizeof(gStatusLine)); +// memset(gFrameBuffer, 0, sizeof(gFrameBuffer)); +// +// if (BootMode == BOOT_MODE_F_LOCK) { +// //解锁,全部按键 +// UI_PrintStringSmall(解锁, 0, 127, 1); +// UI_PrintStringSmall(全部按键, 0, 127, 3); +// ST7565_BlitStatusLine(); // blank status line +// ST7565_BlitFullScreen(); +// } +// +// +//} +//void UI_DisplayWelcome(void) { +// BACKLIGHT_TurnOn(); +// +// char WelcomeString0[16]={0}; +// char WelcomeString1[16]={0}; +// +// memset(gStatusLine, 0, sizeof(gStatusLine)); +// memset(gFrameBuffer, 0, sizeof(gFrameBuffer)); +// +// +// +// +//# +// +// EEPROM_ReadBuffer(0x0EB0, WelcomeString0, 16); +// EEPROM_ReadBuffer(0x0EC0, WelcomeString1, 16); +// +// +// UI_PrintStringSmall(WelcomeString0, 0, 127, 0); +// UI_PrintStringSmall(WelcomeString1, 0, 127, 2); +// sprintf(WelcomeString1, "%u.%02uV %u%%", +// gBatteryVoltageAverage / 100, +// gBatteryVoltageAverage % 100, +// BATTERY_VoltsToPercent(gBatteryVoltageAverage)); +// UI_PrintStringSmall(WelcomeString1, 0, 127, 4); +// +// UI_PrintStringSmall(Version, 0, 127, 6); +// +// ST7565_BlitStatusLine(); // blank status line +// ST7565_BlitFullScreen(); +// unsigned char i=250; +// while (i--) { +// if (KEYBOARD_Poll() == KEY_EXIT) +// break; +// SYSTEM_DelayMs(10); +// +// +// } +// +//} +// diff --git a/ui/welcome.h b/ui/welcome.h index e23b26c..0773084 100644 --- a/ui/welcome.h +++ b/ui/welcome.h @@ -17,8 +17,8 @@ #ifndef UI_WELCOME_H #define UI_WELCOME_H #include "helper/boot.h" -void UI_DisplayReleaseKeys(BOOT_Mode_t BootMode); -void UI_DisplayWelcome(void); +//void UI_DisplayReleaseKeys(BOOT_Mode_t BootMode); +//void UI_DisplayWelcome(void); #endif diff --git a/version.c b/version.c index 74541f0..f4ffe9c 100644 --- a/version.c +++ b/version.c @@ -11,5 +11,5 @@ const char Version[] = "OEFW-"VER; const char UART_Version[] = "UV-K5 Firmware, Open Edition, OEFW-"VER"\r\n"; #else - const char Version[] = VER; + const char Version[] = "RUBO"VER; #endif