summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-10-12 18:11:37 +0000
committerNils Wallménius <nils@rockbox.org>2009-10-12 18:11:37 +0000
commitefdbcc114caa0e25b4900f8b2f6f444632a618e0 (patch)
treed64dab24951ce20e9909a0d9d674c86cab583b10
parent301f84547335b855348eb33a1fbbf75f0d33360d (diff)
downloadrockbox-efdbcc114caa0e25b4900f8b2f6f444632a618e0.tar.gz
rockbox-efdbcc114caa0e25b4900f8b2f6f444632a618e0.zip
Fix typo from r19579 that prevented this code from building, avoid copying lang strings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23134 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/screens.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/apps/screens.c b/apps/screens.c
index 42ea9f29c9..3e7018686f 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -295,36 +295,35 @@ static void charging_display_info(bool animate)
295 const int pox_y = 32; 295 const int pox_y = 32;
296 static unsigned phase = 3; 296 static unsigned phase = 3;
297 unsigned i; 297 unsigned i;
298 char buf[32]; 298 const char *s;
299 (void)buf;
300 299
301#ifdef NEED_ATA_POWER_BATT_MEASURE 300#ifdef NEED_ATA_POWER_BATT_MEASURE
302 if (ide_powered()) /* FM and V2 can only measure when ATA power is on */ 301 if (ide_powered()) /* FM and V2 can only measure when ATA power is on */
303#endif 302#endif
304 { 303 {
304 char buf[32];
305 int battv = battery_voltage(); 305 int battv = battery_voltage();
306 snprintf(buf, 32, " Batt: %d.%02dV %d%% ", battv / 1000, 306 snprintf(buf, 32, " Batt: %d.%02dV %d%% ", battv / 1000,
307 (battv % 1000) / 10, battery_level()); 307 (battv % 1000) / 10, battery_level());
308 lcd_puts(0, 7, buf); 308 lcd_puts(0, 7, buf);
309 } 309 }
310 310
311#ifdef ARCHOS_RECORER 311#ifdef ARCHOS_RECORDER
312 snprintf(buf, 32, "Charge mode:"); 312 lcd_puts(0, 2, "Charge mode:");
313 lcd_puts(0, 2, buf);
314 313
315 if (charge_state == CHARGING) 314 if (charge_state == CHARGING)
316 snprintf(buf, 32, str(LANG_BATTERY_CHARGE)); 315 s = str(LANG_BATTERY_CHARGE);
317 else if (charge_state == TOPOFF) 316 else if (charge_state == TOPOFF)
318 snprintf(buf, 32, str(LANG_BATTERY_TOPOFF_CHARGE)); 317 s = str(LANG_BATTERY_TOPOFF_CHARGE);
319 else if (charge_state == TRICKLE) 318 else if (charge_state == TRICKLE)
320 snprintf(buf, 32, str(LANG_BATTERY_TRICKLE_CHARGE)); 319 s = str(LANG_BATTERY_TRICKLE_CHARGE);
321 else 320 else
322 snprintf(buf, 32, "not charging"); 321 s = "not charging";
323 322
324 lcd_puts(0, 3, buf); 323 lcd_puts(0, 3, s);
325 if (!charger_enabled()) 324 if (!charger_enabled())
326 animate = false; 325 animate = false;
327#endif /* ARCHOS_RECORER */ 326#endif /* ARCHOS_RECORDER */
328 327
329 /* middle part */ 328 /* middle part */
330 memset(charging_logo+3, 0x00, 32); 329 memset(charging_logo+3, 0x00, 32);