diff options
Diffstat (limited to 'apps/main_menu.c')
-rw-r--r-- | apps/main_menu.c | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index dfe5b46b56..556c414636 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -137,33 +137,39 @@ void show_info(void) | |||
137 | char s[32]; | 137 | char s[32]; |
138 | int buflen = ((mp3end - mp3buf) * 100) / 0x100000; | 138 | int buflen = ((mp3end - mp3buf) * 100) / 0x100000; |
139 | int integer, decimal; | 139 | int integer, decimal; |
140 | 140 | bool done = false; | |
141 | lcd_clear_display(); | 141 | |
142 | lcd_puts(0, 0, "Rockbox info:"); | 142 | while(!done) |
143 | /* TODO: add disk size/usage info, battery charge etc here? */ | 143 | { |
144 | 144 | lcd_clear_display(); | |
145 | integer = buflen / 100; | 145 | lcd_puts(0, 0, "Rockbox info:"); |
146 | decimal = buflen % 100; | 146 | |
147 | integer = buflen / 100; | ||
148 | decimal = buflen % 100; | ||
147 | #ifdef HAVE_LCD_CHARCELLS | 149 | #ifdef HAVE_LCD_CHARCELLS |
148 | snprintf(s, sizeof(s), "Buf: %d.%02dMb", integer, decimal); | 150 | snprintf(s, sizeof(s), "Buf: %d.%02dMb", integer, decimal); |
149 | lcd_puts(0, 0, s); | 151 | lcd_puts(0, 0, s); |
150 | #else | 152 | #else |
151 | snprintf(s, sizeof(s), "Buffer: %d.%02d Mb", integer, decimal); | 153 | snprintf(s, sizeof(s), "Buffer: %d.%02d Mb", integer, decimal); |
152 | lcd_puts(0, 2, s); | 154 | lcd_puts(0, 2, s); |
153 | #endif | 155 | #endif |
154 | 156 | ||
155 | #ifdef HAVE_LCD_CHARCELLS | 157 | #ifdef HAVE_LCD_CHARCELLS |
156 | snprintf(s, sizeof(s), "Batt: %d%%", battery_level()); | 158 | snprintf(s, sizeof(s), "Batt: %d%%", battery_level()); |
157 | lcd_puts(0, 1, s); | 159 | lcd_puts(0, 1, s); |
158 | #else | 160 | #else |
159 | snprintf(s, sizeof(s), "Battery: %d%%", battery_level()); | 161 | snprintf(s, sizeof(s), "Battery: %d%%", battery_level()); |
160 | lcd_puts(0, 3, s); | 162 | lcd_puts(0, 3, s); |
161 | #endif | 163 | #endif |
162 | 164 | ||
163 | lcd_update(); | 165 | lcd_update(); |
164 | 166 | ||
165 | /* Wait for a key to be pushed */ | 167 | sleep(HZ/2); |
166 | while(button_get(true) & BUTTON_REL); | 168 | |
169 | /* Wait for a key to be pushed */ | ||
170 | if(button_get(false) & ~BUTTON_REL) | ||
171 | done = true; | ||
172 | } | ||
167 | } | 173 | } |
168 | 174 | ||
169 | void main_menu(void) | 175 | void main_menu(void) |