diff options
author | Heikki Hannikainen <hessuh@rockbox.org> | 2002-08-12 11:08:50 +0000 |
---|---|---|
committer | Heikki Hannikainen <hessuh@rockbox.org> | 2002-08-12 11:08:50 +0000 |
commit | 77e05c680388838b489e53f621c987b531d968dd (patch) | |
tree | 97ac4d984df4f0cbabf3acecdaf6159bfc365c21 /apps/main_menu.c | |
parent | 5ba6f01bdea716042497b5cfb5543dbe364e0171 (diff) | |
download | rockbox-77e05c680388838b489e53f621c987b531d968dd.tar.gz rockbox-77e05c680388838b489e53f621c987b531d968dd.zip |
info menu: show 'charging' instead of charge percentage while charging,
the percentage is incorrect anyway, and an indication of charging is good.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1681 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/main_menu.c')
-rw-r--r-- | apps/main_menu.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index a71bbccfd8..4b83330a35 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "playlist.h" | 31 | #include "playlist.h" |
32 | #include "settings.h" | 32 | #include "settings.h" |
33 | #include "settings_menu.h" | 33 | #include "settings_menu.h" |
34 | #include "power.h" | ||
34 | #include "powermgmt.h" | 35 | #include "powermgmt.h" |
35 | #include "sound_menu.h" | 36 | #include "sound_menu.h" |
36 | 37 | ||
@@ -153,14 +154,22 @@ void show_info(void) | |||
153 | snprintf(s, sizeof(s), "Buffer: %d.%02d Mb", integer, decimal); | 154 | snprintf(s, sizeof(s), "Buffer: %d.%02d Mb", integer, decimal); |
154 | lcd_puts(0, 2, s); | 155 | lcd_puts(0, 2, s); |
155 | #endif | 156 | #endif |
156 | 157 | ||
157 | #ifdef HAVE_LCD_CHARCELLS | 158 | #ifdef HAVE_LCD_CHARCELLS |
158 | snprintf(s, sizeof(s), "Batt: %d%%%s", battery_level(), battery_level_safe() ? "" : "!"); | 159 | snprintf(s, sizeof(s), "Batt: %d%%%s", battery_level(), battery_level_safe() ? "" : "!"); |
159 | lcd_puts(0, 1, s); | 160 | lcd_puts(0, 1, s); |
160 | #else | 161 | #else |
162 | #ifdef HAVE_CHARGE_CTRL | ||
163 | if (charger_enabled) | ||
164 | snprintf(s, sizeof(s), "Battery: charging"); | ||
165 | else | ||
166 | snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!"); | ||
167 | lcd_puts(0, 3, s); | ||
168 | #else | ||
161 | snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!"); | 169 | snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!"); |
162 | lcd_puts(0, 3, s); | 170 | lcd_puts(0, 3, s); |
163 | #endif | 171 | #endif |
172 | #endif | ||
164 | 173 | ||
165 | lcd_update(); | 174 | lcd_update(); |
166 | 175 | ||