1
0
Fork 0
forked from len0rd/rockbox

added BUTTON_LEFT as an exit to a few entrys

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1658 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Hak 2002-08-10 08:52:11 +00:00
parent 6ad0a4bbe3
commit 50fc3ce551

View file

@ -73,6 +73,7 @@ void dbg_os(void)
switch(button) switch(button)
{ {
case BUTTON_OFF: case BUTTON_OFF:
case BUTTON_LEFT:
return; return;
} }
} }
@ -456,9 +457,12 @@ void view_battery(void)
for (i = BAT_FIRST_VAL; i < POWER_HISTORY_LEN; i++) { for (i = BAT_FIRST_VAL; i < POWER_HISTORY_LEN; i++) {
if (power_history[i] > maxv) if (power_history[i] > maxv)
maxv = power_history[i]; maxv = power_history[i];
if ((minv == 0) || ((power_history[i]) && (power_history[i] < minv)) ) if ((minv == 0) || ((power_history[i]) &&
(power_history[i] < minv)) )
{
minv = power_history[i]; minv = power_history[i];
} }
}
if (minv < 1) if (minv < 1)
minv = 1; minv = 1;
@ -467,14 +471,16 @@ void view_battery(void)
lcd_clear_display(); lcd_clear_display();
lcd_puts(0, 0, "Battery voltage:"); lcd_puts(0, 0, "Battery voltage:");
snprintf(buf, 30, "scale %d.%02d-%d.%02d V", minv / 100, minv % 100, maxv / 100, maxv % 100); snprintf(buf, 30, "scale %d.%02d-%d.%02d V",
minv / 100, minv % 100, maxv / 100, maxv % 100);
lcd_puts(0, 1, buf); lcd_puts(0, 1, buf);
x = 0; x = 0;
for (i = BAT_FIRST_VAL+1; i < POWER_HISTORY_LEN; i++) { for (i = BAT_FIRST_VAL+1; i < POWER_HISTORY_LEN; i++) {
y = (power_history[i] - minv) * BAT_YSPACE / (maxv - minv); y = (power_history[i] - minv) * BAT_YSPACE / (maxv - minv);
lcd_clearline(x, LCD_HEIGHT-1, x, 20); lcd_clearline(x, LCD_HEIGHT-1, x, 20);
lcd_drawline(x, LCD_HEIGHT-1, x, MIN(MAX(LCD_HEIGHT-1 - y, 20), LCD_HEIGHT-1)); lcd_drawline(x, LCD_HEIGHT-1, x,
MIN(MAX(LCD_HEIGHT-1 - y, 20), LCD_HEIGHT-1));
x++; x++;
} }
@ -490,7 +496,8 @@ void view_battery(void)
y = (adc_read(ADC_EXT_POWER) * EXT_SCALE_FACTOR) / 10000; y = (adc_read(ADC_EXT_POWER) * EXT_SCALE_FACTOR) / 10000;
snprintf(buf, 30, "External: %d.%02d V", y / 100, y % 100); snprintf(buf, 30, "External: %d.%02d V", y / 100, y % 100);
lcd_puts(0, 2, buf); lcd_puts(0, 2, buf);
snprintf(buf, 30, "Charger: %s", charger_inserted() ? "present" : "absent"); snprintf(buf, 30, "Charger: %s",
charger_inserted() ? "present" : "absent");
lcd_puts(0, 3, buf); lcd_puts(0, 3, buf);
#ifdef HAVE_CHARGE_CTRL #ifdef HAVE_CHARGE_CTRL
snprintf(buf, 30, "Charging: %s", charger_enabled ? "yes" : "no"); snprintf(buf, 30, "Charging: %s", charger_enabled ? "yes" : "no");
@ -498,7 +505,8 @@ void view_battery(void)
#endif #endif
y = 0; y = 0;
for (i = 0; i < CHARGE_END_NEGD; i++) for (i = 0; i < CHARGE_END_NEGD; i++)
y += power_history[POWER_HISTORY_LEN-1-i]*100 - power_history[POWER_HISTORY_LEN-1-i-1]*100; y += power_history[POWER_HISTORY_LEN-1-i]*100 -
power_history[POWER_HISTORY_LEN-1-i-1]*100;
y = y / CHARGE_END_NEGD; y = y / CHARGE_END_NEGD;
snprintf(buf, 30, "short delta: %d", y); snprintf(buf, 30, "short delta: %d", y);
@ -506,7 +514,8 @@ void view_battery(void)
y = 0; y = 0;
for (i = 0; i < CHARGE_END_ZEROD; i++) for (i = 0; i < CHARGE_END_ZEROD; i++)
y += power_history[POWER_HISTORY_LEN-1-i]*100 - power_history[POWER_HISTORY_LEN-1-i-1]*100; y += power_history[POWER_HISTORY_LEN-1-i]*100 -
power_history[POWER_HISTORY_LEN-1-i-1]*100;
y = y / CHARGE_END_ZEROD; y = y / CHARGE_END_ZEROD;
snprintf(buf, 30, "long delta: %d", y); snprintf(buf, 30, "long delta: %d", y);
@ -522,10 +531,11 @@ void view_battery(void)
lcd_puts(0, 0, "Voltage deltas:"); lcd_puts(0, 0, "Voltage deltas:");
for (i = 0; i <= 6; i++) { for (i = 0; i <= 6; i++) {
y = power_history[POWER_HISTORY_LEN-1-i] - power_history[POWER_HISTORY_LEN-1-i-1]; y = power_history[POWER_HISTORY_LEN-1-i] -
power_history[POWER_HISTORY_LEN-1-i-1];
snprintf(buf, 30, "-%d min: %s%d.%02d V", i, snprintf(buf, 30, "-%d min: %s%d.%02d V", i,
(y < 0) ? "-" : "", (y < 0) ? "-" : "", ((y < 0) ? y * -1 : y) / 100,
((y < 0) ? y * -1 : y) / 100, ((y < 0) ? y * -1 : y ) % 100); ((y < 0) ? y * -1 : y ) % 100);
lcd_puts(0, i+1, buf); lcd_puts(0, i+1, buf);
} }
break; break;