diff options
-rw-r--r-- | apps/debug_menu.c | 2 | ||||
-rw-r--r-- | apps/gui/gwps-common.c | 12 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 2 | ||||
-rw-r--r-- | firmware/drivers/power.c | 15 |
4 files changed, 9 insertions, 22 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 69c0e2fceb..66b4fdbb8d 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1333,11 +1333,13 @@ static bool view_runtime(void) | |||
1333 | #endif | 1333 | #endif |
1334 | 1334 | ||
1335 | if (state & 1) { | 1335 | if (state & 1) { |
1336 | #ifdef HAVE_CHARGING | ||
1336 | if (charger_inserted()) | 1337 | if (charger_inserted()) |
1337 | { | 1338 | { |
1338 | global_settings.runtime = 0; | 1339 | global_settings.runtime = 0; |
1339 | } | 1340 | } |
1340 | else | 1341 | else |
1342 | #endif | ||
1341 | { | 1343 | { |
1342 | global_settings.runtime += ((current_tick - lasttime) / HZ); | 1344 | global_settings.runtime += ((current_tick - lasttime) / HZ); |
1343 | } | 1345 | } |
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index c9d093963e..b9b3e9bcd0 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -653,27 +653,21 @@ static char* get_tag(struct wps_data* wps_data, | |||
653 | return buf; | 653 | return buf; |
654 | } | 654 | } |
655 | 655 | ||
656 | #ifdef HAVE_CHARGING | ||
656 | case 'p': /* External power plugged in? */ | 657 | case 'p': /* External power plugged in? */ |
657 | { | 658 | { |
658 | #ifdef HAVE_CHARGING | ||
659 | if(charger_input_state==CHARGER) | 659 | if(charger_input_state==CHARGER) |
660 | #else | ||
661 | if(charger_inserted()) | ||
662 | #endif | ||
663 | return "p"; | 660 | return "p"; |
664 | else | 661 | else |
665 | return NULL; | 662 | return NULL; |
666 | } | 663 | } |
664 | #endif | ||
667 | #if defined(HAVE_CHARGE_CTRL) || \ | 665 | #if defined(HAVE_CHARGE_CTRL) || \ |
668 | defined (HAVE_CHARGE_STATE) || \ | 666 | defined (HAVE_CHARGE_STATE) || \ |
669 | CONFIG_BATTERY == BATT_LIION2200 | 667 | CONFIG_BATTERY == BATT_LIION2200 |
670 | case 'c': /* Charging */ | 668 | case 'c': /* Charging */ |
671 | { | 669 | { |
672 | if (charge_state == CHARGING | 670 | if (charge_state == CHARGING || charge_state == TOPOFF) { |
673 | #ifdef HAVE_CHARGE_CTRL | ||
674 | || charge_state == TOPOFF | ||
675 | #endif | ||
676 | ) { | ||
677 | return "c"; | 671 | return "c"; |
678 | } else { | 672 | } else { |
679 | return NULL; | 673 | return NULL; |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 57308c52f2..d8e611af85 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -129,8 +129,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
129 | bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume); | 129 | bar->info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume); |
130 | #ifdef HAVE_CHARGING | 130 | #ifdef HAVE_CHARGING |
131 | bar->info.inserted = (charger_input_state == CHARGER); | 131 | bar->info.inserted = (charger_input_state == CHARGER); |
132 | #else | ||
133 | bar->info.inserted = charger_inserted(); | ||
134 | #endif | 132 | #endif |
135 | bar->info.battlevel = battery_level(); | 133 | bar->info.battlevel = battery_level(); |
136 | bar->info.battery_safe = battery_level_safe(); | 134 | bar->info.battery_safe = battery_level_safe(); |
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index 8a20890228..b5d4d7d22a 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c | |||
@@ -104,33 +104,26 @@ void power_init(void) | |||
104 | #endif | 104 | #endif |
105 | } | 105 | } |
106 | 106 | ||
107 | #ifdef HAVE_CHARGING | ||
107 | bool charger_inserted(void) | 108 | bool charger_inserted(void) |
108 | { | 109 | { |
109 | #if CONFIG_CPU == MCF5249 | 110 | #if CONFIG_CPU == MCF5249 |
110 | return (GPIO1_READ & 0x00400000)?true:false; | 111 | return (GPIO1_READ & 0x00400000)?true:false; |
111 | #elif defined(GMINI_ARCH) | 112 | #elif defined(GMINI_ARCH) |
112 | return (P7 & 0x80) == 0; | 113 | return (P7 & 0x80) == 0; |
113 | #else | 114 | #elif defined(HAVE_CHARGE_CTRL) |
114 | #ifdef HAVE_CHARGING | ||
115 | #ifdef HAVE_CHARGE_CTRL | ||
116 | /* Recorder */ | 115 | /* Recorder */ |
117 | return adc_read(ADC_EXT_POWER) > 0x100; | 116 | return adc_read(ADC_EXT_POWER) > 0x100; |
118 | #else | 117 | #elif defined (HAVE_FMADC) |
119 | #ifdef HAVE_FMADC | ||
120 | /* FM or V2, can also charge from the USB port */ | 118 | /* FM or V2, can also charge from the USB port */ |
121 | return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF) || | 119 | return (adc_read(ADC_CHARGE_REGULATOR) < 0x1FF) || |
122 | (adc_read(ADC_USB_POWER) < 0x1FF); | 120 | (adc_read(ADC_USB_POWER) < 0x1FF); |
123 | #else | 121 | #else |
124 | /* Player */ | 122 | /* Player */ |
125 | return (PADR & 1) == 0; | 123 | return (PADR & 1) == 0; |
126 | #endif /* HAVE_FMADC */ | ||
127 | #endif /* HAVE_CHARGE_CTRL */ | ||
128 | #else | ||
129 | /* Ondio */ | ||
130 | return false; | ||
131 | #endif /* HAVE_CHARGING */ | ||
132 | #endif | 124 | #endif |
133 | } | 125 | } |
126 | #endif /* HAVE_CHARGING */ | ||
134 | 127 | ||
135 | #ifdef HAVE_CHARGE_CTRL | 128 | #ifdef HAVE_CHARGE_CTRL |
136 | void charger_enable(bool on) | 129 | void charger_enable(bool on) |