diff --git a/main.c b/main.c index 5c9c833..0bdbfd6 100644 --- a/main.c +++ b/main.c @@ -140,7 +140,7 @@ void Main(void) // } // else // { - //UI_DisplayWelcome(); + UI_DisplayWelcome(); // if (gEeprom.POWER_ON_DISPLAY_MODE != POWER_ON_DISPLAY_MODE_NONE) diff --git a/ui/welcome.c b/ui/welcome.c index 53ec8de..56a5d17 100644 --- a/ui/welcome.c +++ b/ui/welcome.c @@ -42,44 +42,44 @@ // //} -//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_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 ffb81d8..3c5cf31 100644 --- a/ui/welcome.h +++ b/ui/welcome.h @@ -18,7 +18,7 @@ #define UI_WELCOME_H #include "helper/boot.h" //void UI_DisplayReleaseKeys(BOOT_Mode_t BootMode); -//void UI_DisplayWelcome(void); +void UI_DisplayWelcome(void); #endif