forked from len0rd/rockbox
Added another LEFT exit. Split some long lines.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1659 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg
parent
50fc3ce551
commit
fe97b578eb
1 changed files with 102 additions and 99 deletions
|
|
@ -72,9 +72,9 @@ void dbg_os(void)
|
|||
|
||||
switch(button)
|
||||
{
|
||||
case BUTTON_OFF:
|
||||
case BUTTON_LEFT:
|
||||
return;
|
||||
case BUTTON_OFF:
|
||||
case BUTTON_LEFT:
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -176,20 +176,21 @@ void dbg_ports(void)
|
|||
|
||||
switch(button)
|
||||
{
|
||||
case BUTTON_ON:
|
||||
charge_status = charge_status?false:true;
|
||||
charger_enable(charge_status);
|
||||
break;
|
||||
case BUTTON_ON:
|
||||
charge_status = charge_status?false:true;
|
||||
charger_enable(charge_status);
|
||||
break;
|
||||
|
||||
case BUTTON_UP:
|
||||
ide_status = ide_status?false:true;
|
||||
ide_power_enable(ide_status);
|
||||
break;
|
||||
case BUTTON_UP:
|
||||
ide_status = ide_status?false:true;
|
||||
ide_power_enable(ide_status);
|
||||
break;
|
||||
|
||||
case BUTTON_OFF:
|
||||
charger_enable(false);
|
||||
ide_power_enable(true);
|
||||
return;
|
||||
case BUTTON_OFF:
|
||||
case BUTTON_LEFT:
|
||||
charger_enable(false);
|
||||
ide_power_enable(true);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -258,7 +259,8 @@ void dbg_ports(void)
|
|||
}
|
||||
lcd_puts(0, 0, buf);
|
||||
|
||||
battery_voltage = (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) / 10000;
|
||||
battery_voltage = (adc_read(ADC_UNREG_POWER) *
|
||||
BATTERY_SCALE_FACTOR) / 10000;
|
||||
batt_int = battery_voltage / 100;
|
||||
batt_frac = battery_voltage % 100;
|
||||
|
||||
|
|
@ -451,94 +453,95 @@ void view_battery(void)
|
|||
while(1)
|
||||
{
|
||||
switch (view) {
|
||||
case 0: /* voltage history graph */
|
||||
/* Find maximum and minimum voltage for scaling */
|
||||
maxv = minv = 0;
|
||||
for (i = BAT_FIRST_VAL; i < POWER_HISTORY_LEN; i++) {
|
||||
if (power_history[i] > maxv)
|
||||
maxv = power_history[i];
|
||||
if ((minv == 0) || ((power_history[i]) &&
|
||||
(power_history[i] < minv)) )
|
||||
{
|
||||
minv = power_history[i];
|
||||
case 0: /* voltage history graph */
|
||||
/* Find maximum and minimum voltage for scaling */
|
||||
maxv = minv = 0;
|
||||
for (i = BAT_FIRST_VAL; i < POWER_HISTORY_LEN; i++) {
|
||||
if (power_history[i] > maxv)
|
||||
maxv = power_history[i];
|
||||
if ((minv == 0) || ((power_history[i]) &&
|
||||
(power_history[i] < minv)) )
|
||||
{
|
||||
minv = power_history[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (minv < 1)
|
||||
minv = 1;
|
||||
if (maxv < 2)
|
||||
maxv = 2;
|
||||
if (minv < 1)
|
||||
minv = 1;
|
||||
if (maxv < 2)
|
||||
maxv = 2;
|
||||
|
||||
lcd_clear_display();
|
||||
lcd_puts(0, 0, "Battery voltage:");
|
||||
snprintf(buf, 30, "scale %d.%02d-%d.%02d V",
|
||||
minv / 100, minv % 100, maxv / 100, maxv % 100);
|
||||
lcd_puts(0, 1, buf);
|
||||
lcd_clear_display();
|
||||
lcd_puts(0, 0, "Battery voltage:");
|
||||
snprintf(buf, 30, "scale %d.%02d-%d.%02d V",
|
||||
minv / 100, minv % 100, maxv / 100, maxv % 100);
|
||||
lcd_puts(0, 1, buf);
|
||||
|
||||
x = 0;
|
||||
for (i = BAT_FIRST_VAL+1; i < POWER_HISTORY_LEN; i++) {
|
||||
y = (power_history[i] - minv) * BAT_YSPACE / (maxv - minv);
|
||||
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));
|
||||
x++;
|
||||
}
|
||||
x = 0;
|
||||
for (i = BAT_FIRST_VAL+1; i < POWER_HISTORY_LEN; i++) {
|
||||
y = (power_history[i] - minv) * BAT_YSPACE / (maxv - minv);
|
||||
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));
|
||||
x++;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
break;
|
||||
case 1: /* status: */
|
||||
lcd_clear_display();
|
||||
lcd_puts(0, 0, "Power status:");
|
||||
|
||||
case 1: /* status: */
|
||||
lcd_clear_display();
|
||||
lcd_puts(0, 0, "Power status:");
|
||||
|
||||
y = (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) / 10000;
|
||||
snprintf(buf, 30, "Battery: %d.%02d V", y / 100, y % 100);
|
||||
lcd_puts(0, 1, buf);
|
||||
y = (adc_read(ADC_EXT_POWER) * EXT_SCALE_FACTOR) / 10000;
|
||||
snprintf(buf, 30, "External: %d.%02d V", y / 100, y % 100);
|
||||
lcd_puts(0, 2, buf);
|
||||
snprintf(buf, 30, "Charger: %s",
|
||||
charger_inserted() ? "present" : "absent");
|
||||
lcd_puts(0, 3, buf);
|
||||
y = (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) / 10000;
|
||||
snprintf(buf, 30, "Battery: %d.%02d V", y / 100, y % 100);
|
||||
lcd_puts(0, 1, buf);
|
||||
y = (adc_read(ADC_EXT_POWER) * EXT_SCALE_FACTOR) / 10000;
|
||||
snprintf(buf, 30, "External: %d.%02d V", y / 100, y % 100);
|
||||
lcd_puts(0, 2, buf);
|
||||
snprintf(buf, 30, "Charger: %s",
|
||||
charger_inserted() ? "present" : "absent");
|
||||
lcd_puts(0, 3, buf);
|
||||
#ifdef HAVE_CHARGE_CTRL
|
||||
snprintf(buf, 30, "Charging: %s", charger_enabled ? "yes" : "no");
|
||||
lcd_puts(0, 4, buf);
|
||||
snprintf(buf, 30, "Charging: %s",
|
||||
charger_enabled ? "yes" : "no");
|
||||
lcd_puts(0, 4, buf);
|
||||
#endif
|
||||
y = 0;
|
||||
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 = y / CHARGE_END_NEGD;
|
||||
y = 0;
|
||||
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 = y / CHARGE_END_NEGD;
|
||||
|
||||
snprintf(buf, 30, "short delta: %d", y);
|
||||
lcd_puts(0, 5, buf);
|
||||
snprintf(buf, 30, "short delta: %d", y);
|
||||
lcd_puts(0, 5, buf);
|
||||
|
||||
y = 0;
|
||||
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 = y / CHARGE_END_ZEROD;
|
||||
y = 0;
|
||||
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 = y / CHARGE_END_ZEROD;
|
||||
|
||||
snprintf(buf, 30, "long delta: %d", y);
|
||||
lcd_puts(0, 6, buf);
|
||||
snprintf(buf, 30, "long delta: %d", y);
|
||||
lcd_puts(0, 6, buf);
|
||||
|
||||
#ifdef HAVE_CHARGE_CTRL
|
||||
lcd_puts(0, 7, power_message);
|
||||
lcd_puts(0, 7, power_message);
|
||||
#endif
|
||||
break;
|
||||
break;
|
||||
|
||||
case 2: /* voltage deltas: */
|
||||
lcd_clear_display();
|
||||
lcd_puts(0, 0, "Voltage deltas:");
|
||||
case 2: /* voltage deltas: */
|
||||
lcd_clear_display();
|
||||
lcd_puts(0, 0, "Voltage deltas:");
|
||||
|
||||
for (i = 0; i <= 6; i++) {
|
||||
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,
|
||||
(y < 0) ? "-" : "", ((y < 0) ? y * -1 : y) / 100,
|
||||
((y < 0) ? y * -1 : y ) % 100);
|
||||
lcd_puts(0, i+1, buf);
|
||||
}
|
||||
break;
|
||||
for (i = 0; i <= 6; i++) {
|
||||
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,
|
||||
(y < 0) ? "-" : "", ((y < 0) ? y * -1 : y) / 100,
|
||||
((y < 0) ? y * -1 : y ) % 100);
|
||||
lcd_puts(0, i+1, buf);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
lcd_update();
|
||||
|
|
@ -546,19 +549,19 @@ void view_battery(void)
|
|||
|
||||
switch(button_get(false))
|
||||
{
|
||||
case BUTTON_UP:
|
||||
if (view)
|
||||
view--;
|
||||
break;
|
||||
case BUTTON_UP:
|
||||
if (view)
|
||||
view--;
|
||||
break;
|
||||
|
||||
case BUTTON_DOWN:
|
||||
if (view < 2)
|
||||
view++;
|
||||
break;
|
||||
case BUTTON_DOWN:
|
||||
if (view < 2)
|
||||
view++;
|
||||
break;
|
||||
|
||||
case BUTTON_LEFT:
|
||||
case BUTTON_OFF:
|
||||
return;
|
||||
case BUTTON_LEFT:
|
||||
case BUTTON_OFF:
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue