devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix typo from r19579 that prevented this code from building, avoid copying lang strings

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23134 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-10-12 18:11:37 +00:00
parent 301f845473
commit efdbcc114c
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
apps/screens.c
View file

@ -295,36 +295,35 @@ static void charging_display_info(bool animate)
const int pox_y = 32; const int pox_y = 32;
static unsigned phase = 3; static unsigned phase = 3;
unsigned i; unsigned i;
char buf[32]; const char *s;
(void)buf;
#ifdef NEED_ATA_POWER_BATT_MEASURE #ifdef NEED_ATA_POWER_BATT_MEASURE
if (ide_powered()) /* FM and V2 can only measure when ATA power is on */ if (ide_powered()) /* FM and V2 can only measure when ATA power is on */
#endif #endif
{ {
char buf[32];
int battv = battery_voltage(); int battv = battery_voltage();
snprintf(buf, 32, " Batt: %d.%02dV %d%% ", battv / 1000, snprintf(buf, 32, " Batt: %d.%02dV %d%% ", battv / 1000,
(battv % 1000) / 10, battery_level()); (battv % 1000) / 10, battery_level());
lcd_puts(0, 7, buf); lcd_puts(0, 7, buf);
} }
#ifdef ARCHOS_RECORER #ifdef ARCHOS_RECORDER
snprintf(buf, 32, "Charge mode:"); lcd_puts(0, 2, "Charge mode:");
lcd_puts(0, 2, buf);
if (charge_state == CHARGING) if (charge_state == CHARGING)
snprintf(buf, 32, str(LANG_BATTERY_CHARGE)); s = str(LANG_BATTERY_CHARGE);
else if (charge_state == TOPOFF) else if (charge_state == TOPOFF)
snprintf(buf, 32, str(LANG_BATTERY_TOPOFF_CHARGE)); s = str(LANG_BATTERY_TOPOFF_CHARGE);
else if (charge_state == TRICKLE) else if (charge_state == TRICKLE)
snprintf(buf, 32, str(LANG_BATTERY_TRICKLE_CHARGE)); s = str(LANG_BATTERY_TRICKLE_CHARGE);
else else
snprintf(buf, 32, "not charging"); s = "not charging";
lcd_puts(0, 3, buf); lcd_puts(0, 3, s);
if (!charger_enabled()) if (!charger_enabled())
animate = false; animate = false;
#endif /* ARCHOS_RECORER */ #endif /* ARCHOS_RECORDER */
/* middle part */ /* middle part */
memset(charging_logo+3, 0x00, 32); memset(charging_logo+3, 0x00, 32);