diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-04-06 22:55:00 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-06 22:55:00 +0000 |
commit | f9b90e91031dbd23fed24e832de4d8d2e15151a0 (patch) | |
tree | 964a492f1c4a658ec0ecb82d100ce62d2f6ec93a /apps/plugins/battery_bench.c | |
parent | a5d7309d96cca974e1524dc746482ab2a26d7395 (diff) | |
download | rockbox-f9b90e91031dbd23fed24e832de4d8d2e15151a0.tar.gz rockbox-f9b90e91031dbd23fed24e832de4d8d2e15151a0.zip |
Now charcell displays require lcd_update() for updating the main lcd content like bitmap displays.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13050 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/battery_bench.c')
-rw-r--r-- | apps/plugins/battery_bench.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 53dd5be4c0..13ce172f67 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -129,10 +129,11 @@ bool exit_tsr(bool reenter) | |||
129 | rb->lcd_clear_display(); | 129 | rb->lcd_clear_display(); |
130 | rb->lcd_puts_scroll(0, 0, "Batt.Bench is currently running."); | 130 | rb->lcd_puts_scroll(0, 0, "Batt.Bench is currently running."); |
131 | rb->lcd_puts_scroll(0, 1, "Press OFF to cancel the test"); | 131 | rb->lcd_puts_scroll(0, 1, "Press OFF to cancel the test"); |
132 | rb->lcd_puts_scroll(0, 2, "Anything else will resume"); | ||
133 | #ifdef HAVE_LCD_BITMAP | 132 | #ifdef HAVE_LCD_BITMAP |
134 | rb->lcd_update(); | 133 | rb->lcd_puts_scroll(0, 2, "Anything else will resume"); |
135 | #endif | 134 | #endif |
135 | rb->lcd_update(); | ||
136 | |||
136 | if (rb->button_get(true) != BATTERY_OFF) | 137 | if (rb->button_get(true) != BATTERY_OFF) |
137 | exit = false; | 138 | exit = false; |
138 | if (exit) | 139 | if (exit) |
@@ -369,21 +370,24 @@ int main(void) | |||
369 | int button, fd; | 370 | int button, fd; |
370 | bool on = false; | 371 | bool on = false; |
371 | #ifdef HAVE_LCD_BITMAP | 372 | #ifdef HAVE_LCD_BITMAP |
373 | int i; | ||
372 | const char *msgs[] = { "Battery Benchmark","Check file", BATTERY_LOG, | 374 | const char *msgs[] = { "Battery Benchmark","Check file", BATTERY_LOG, |
373 | "for more info", "PLAY - start", "OFF - quit" }; | 375 | "for more info", "PLAY - start", "OFF - quit" }; |
374 | #endif | 376 | #endif |
375 | rb->lcd_clear_display(); | 377 | rb->lcd_clear_display(); |
376 | 378 | ||
377 | #ifdef HAVE_LCD_BITMAP | 379 | #ifdef HAVE_LCD_BITMAP |
378 | int i; | ||
379 | |||
380 | rb->lcd_clear_display(); | 380 | rb->lcd_clear_display(); |
381 | rb->lcd_setfont(FONT_SYSFIXED); | 381 | rb->lcd_setfont(FONT_SYSFIXED); |
382 | 382 | ||
383 | for(i = 0; i<(int)(sizeof(msgs)/sizeof(char *)); i++) | 383 | for(i = 0; i<(int)(sizeof(msgs)/sizeof(char *)); i++) |
384 | put_centered_str(msgs[i],rb->lcd_putsxy,LCD_WIDTH,i+1); | 384 | put_centered_str(msgs[i],rb->lcd_putsxy,LCD_WIDTH,i+1); |
385 | 385 | #else | |
386 | rb->lcd_puts_scroll(0, 0, "Batt.Bench."); | ||
387 | rb->lcd_puts_scroll(0, 1, "PLAY/STOP"); | ||
388 | #endif | ||
386 | rb->lcd_update(); | 389 | rb->lcd_update(); |
390 | |||
387 | #ifdef HAVE_REMOTE_LCD | 391 | #ifdef HAVE_REMOTE_LCD |
388 | rb->lcd_remote_clear_display(); | 392 | rb->lcd_remote_clear_display(); |
389 | put_centered_str(msgs[0],rb->lcd_remote_putsxy,LCD_REMOTE_WIDTH,0); | 393 | put_centered_str(msgs[0],rb->lcd_remote_putsxy,LCD_REMOTE_WIDTH,0); |
@@ -394,11 +398,6 @@ int main(void) | |||
394 | rb->lcd_remote_update(); | 398 | rb->lcd_remote_update(); |
395 | #endif | 399 | #endif |
396 | 400 | ||
397 | #else | ||
398 | rb->lcd_puts_scroll(0, 0, "Batt.Bench."); | ||
399 | rb->lcd_puts_scroll(0, 1, "PLAY/STOP"); | ||
400 | #endif | ||
401 | |||
402 | do | 401 | do |
403 | { | 402 | { |
404 | button = rb->button_get(true); | 403 | button = rb->button_get(true); |