diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2006-06-06 22:23:52 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2006-06-06 22:23:52 +0000 |
| commit | 0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f (patch) | |
| tree | e3e77d4e6b25b82c82b3570cd8c4a988c7788e66 /apps/plugins | |
| parent | 8c9e22580e220b793130ed3ac67b9c54e85b3d0f (diff) | |
| download | rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.zip rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.gz rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.bz2 rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.xz | |
Work-in-progress rework of charging status reading & display: * Changed several charging related HAVE_* macros into one multi-value CONFIG_CHARGING. * Always use proper macros for charging states. * Battery symbol charging animation now starts from current level on all targets with charging. Two-colour animation kept for non-b&w targets. Round down fill level while charging as before, but round to nearest pixel value for discharging on all targets. * Charging anim fixed on player. * Some code cleanup.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10080 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/battery_bench.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 552be8a..210ecbd 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -128,14 +128,14 @@ void exit_tsr(void) /* use long for aligning */ unsigned long thread_stack[THREAD_STACK_SIZE/sizeof(long)]; -#if defined(HAVE_CHARGING) || defined(HAVE_USB_POWER) +#if defined(CONFIG_CHARGING) || defined(HAVE_USB_POWER) unsigned int charge_state(void) { unsigned int ret = 0; -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING if(rb->charger_inserted()) ret = BIT_CHARGER; -#ifdef HAVE_CHARGE_STATE +#if CONFIG_CHARGING == CHARGING_MONITOR if(rb->charging_state()) ret |= BIT_CHARGING; #endif @@ -154,7 +154,7 @@ void thread(void) int fd, buffelements, tick = 1, i = 0, skipped = 0, exit = 0; int fst = 0, lst = 0; /* first and last skipped tick */ unsigned int last_voltage = 0; -#if defined(HAVE_CHARGING) || defined(HAVE_USB_POWER) +#if defined(CONFIG_CHARGING) || defined(HAVE_USB_POWER) unsigned int last_state = 0; #endif long sleep_time; @@ -202,9 +202,9 @@ void thread(void) rb->fdprintf(fd, "%02d:%02d:%02d, %05d, %03d%%, " "%02d:%02d, %04d, %04d" -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING ", %c" -#ifdef HAVE_CHARGE_STATE +#if CONFIG_CHARGING == CHARGING_MONITOR ", %c" #endif #endif @@ -215,7 +215,7 @@ void thread(void) HMS(secs), secs, bat[j].level, bat[j].eta / 60, bat[j].eta % 60, -#if defined(HAVE_CHARGING) || defined(HAVE_USB_POWER) +#if defined(CONFIG_CHARGING) || defined(HAVE_USB_POWER) (bat[j].voltage & (~(BIT_CHARGER|BIT_CHARGING|BIT_USB_POWER))) *10, @@ -223,9 +223,9 @@ void thread(void) bat[j].voltage * 10, #endif temp + 1 + (j-i) -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING ,(bat[j].voltage & BIT_CHARGER)?'A':'-' -#ifdef HAVE_CHARGE_STATE +#if CONFIG_CHARGING == CHARGING_MONITOR ,(bat[j].voltage & BIT_CHARGING)?'C':'-' #endif #endif @@ -260,7 +260,7 @@ void thread(void) timeflag = true; if(last_voltage != (current_voltage=rb->battery_voltage()) -#if defined(HAVE_CHARGING) || defined(HAVE_USB_POWER) +#if defined(CONFIG_CHARGING) || defined(HAVE_USB_POWER) || last_state != charge_state() #endif ) @@ -280,7 +280,7 @@ void thread(void) bat[i].level = rb->battery_level(); bat[i].eta = rb->battery_time(); last_voltage = bat[i].voltage = current_voltage; -#if defined(HAVE_CHARGING) || defined(HAVE_USB_POWER) +#if defined(CONFIG_CHARGING) || defined(HAVE_USB_POWER) bat[i].voltage |= last_state = charge_state(); #endif i++; @@ -421,10 +421,10 @@ int main(void) "Battery type: %d mAh Buffer Entries: %d\n" " Time:, Seconds:, Level:, Time Left:, Voltage[mV]:," " M/DA:" -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING ", C:" #endif -#ifdef HAVE_CHARGE_STATE +#if CONFIG_CHARGING == CHARGING_MONITOR ", S:" #endif #ifdef HAVE_USB_POWER |