diff options
Diffstat (limited to 'apps/main_menu.c')
-rw-r--r-- | apps/main_menu.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index 9135ea3424..4001e156c3 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -37,10 +37,14 @@ | |||
37 | 37 | ||
38 | #ifdef HAVE_LCD_BITMAP | 38 | #ifdef HAVE_LCD_BITMAP |
39 | #include "games_menu.h" | 39 | #include "games_menu.h" |
40 | #include "screensavers_menu.h" | ||
41 | #include "bmp.h" | 40 | #include "bmp.h" |
42 | #include "icons.h" | 41 | #include "icons.h" |
43 | #endif | 42 | |
43 | #ifdef USE_SCREENSAVERS | ||
44 | #include "screensavers_menu.h" | ||
45 | #endif /* End USE_SCREENSAVERS */ | ||
46 | |||
47 | #endif /* End HAVE_LCD_BITMAP */ | ||
44 | 48 | ||
45 | int show_logo( void ) | 49 | int show_logo( void ) |
46 | { | 50 | { |
@@ -159,17 +163,20 @@ Menu show_info(void) | |||
159 | #endif | 163 | #endif |
160 | 164 | ||
161 | #ifdef HAVE_LCD_CHARCELLS | 165 | #ifdef HAVE_LCD_CHARCELLS |
162 | snprintf(s, sizeof(s), "Batt: %d%%%s", battery_level(), battery_level_safe() ? "" : "!"); | 166 | snprintf(s, sizeof(s), "Batt: %d%%%s", |
167 | battery_level(), battery_level_safe() ? "" : "!"); | ||
163 | lcd_puts(0, 1, s); | 168 | lcd_puts(0, 1, s); |
164 | #else | 169 | #else |
165 | #ifdef HAVE_CHARGE_CTRL | 170 | #ifdef HAVE_CHARGE_CTRL |
166 | if (charger_enabled) | 171 | if (charger_enabled) |
167 | snprintf(s, sizeof(s), "Battery: charging"); | 172 | snprintf(s, sizeof(s), "Battery: charging"); |
168 | else | 173 | else |
169 | snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!"); | 174 | snprintf(s, sizeof(s), "Battery: %d%%%s", |
175 | battery_level(), battery_level_safe() ? "" : " !!"); | ||
170 | lcd_puts(0, 3, s); | 176 | lcd_puts(0, 3, s); |
171 | #else | 177 | #else |
172 | snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!"); | 178 | snprintf(s, sizeof(s), "Battery: %d%%%s", |
179 | battery_level(), battery_level_safe() ? "" : " !!"); | ||
173 | lcd_puts(0, 3, s); | 180 | lcd_puts(0, 3, s); |
174 | #endif | 181 | #endif |
175 | #endif | 182 | #endif |
@@ -197,7 +204,9 @@ Menu main_menu(void) | |||
197 | { "General Settings", settings_menu }, | 204 | { "General Settings", settings_menu }, |
198 | #ifdef HAVE_LCD_BITMAP | 205 | #ifdef HAVE_LCD_BITMAP |
199 | { "Games", games_menu }, | 206 | { "Games", games_menu }, |
207 | #ifdef USE_SCREENSAVERS | ||
200 | { "Screensavers", screensavers_menu }, | 208 | { "Screensavers", screensavers_menu }, |
209 | #endif /* end USE_SCREENSAVERS */ | ||
201 | #endif | 210 | #endif |
202 | { "Info", show_info }, | 211 | { "Info", show_info }, |
203 | { "Version", show_credits }, | 212 | { "Version", show_credits }, |