diff options
-rw-r--r-- | apps/status.c | 8 | ||||
-rw-r--r-- | firmware/drivers/power.c | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/apps/status.c b/apps/status.c index 8ebf662ad8..5d4bba6aac 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -200,7 +200,7 @@ void status_draw(void) | |||
200 | #ifdef HAVE_LCD_BITMAP | 200 | #ifdef HAVE_LCD_BITMAP |
201 | if (global_settings.statusbar) { | 201 | if (global_settings.statusbar) { |
202 | statusbar_wipe(); | 202 | statusbar_wipe(); |
203 | #ifdef HAVE_CHARGE_CTRL | 203 | #ifdef HAVE_CHARGE_CTRL /* Recorder */ |
204 | if(charger_inserted()) { | 204 | if(charger_inserted()) { |
205 | battery_state = true; | 205 | battery_state = true; |
206 | plug_state = true; | 206 | plug_state = true; |
@@ -229,8 +229,12 @@ void status_draw(void) | |||
229 | if (battery_state) | 229 | if (battery_state) |
230 | statusbar_icon_battery(battlevel, plug_state); | 230 | statusbar_icon_battery(battlevel, plug_state); |
231 | #else | 231 | #else |
232 | #ifdef HAVE_FMADC /* FM */ | ||
233 | statusbar_icon_battery(battlevel, charger_inserted()); | ||
234 | #else /* Player */ | ||
232 | statusbar_icon_battery(battlevel, false); | 235 | statusbar_icon_battery(battlevel, false); |
233 | #endif | 236 | #endif /* HAVE_FMADC */ |
237 | #endif /* HAVE_CHARGE_CTRL */ | ||
234 | statusbar_icon_volume(volume); | 238 | statusbar_icon_volume(volume); |
235 | statusbar_icon_play_state(current_mode + Icon_Play); | 239 | statusbar_icon_play_state(current_mode + Icon_Play); |
236 | switch (global_settings.repeat_mode) { | 240 | switch (global_settings.repeat_mode) { |
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index 4d8b1cabb8..d3605065c7 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c | |||
@@ -32,14 +32,17 @@ bool charger_enabled = 0; | |||
32 | bool charger_inserted(void) | 32 | bool charger_inserted(void) |
33 | { | 33 | { |
34 | #ifdef HAVE_CHARGE_CTRL | 34 | #ifdef HAVE_CHARGE_CTRL |
35 | /* Recorder */ | ||
36 | return adc_read(ADC_EXT_POWER) > 0x100; | ||
37 | #else | ||
35 | #ifdef HAVE_FMADC | 38 | #ifdef HAVE_FMADC |
39 | /* FM */ | ||
36 | return adc_read(ADC_CHARGE_REGULATOR) < 0x1FF; | 40 | return adc_read(ADC_CHARGE_REGULATOR) < 0x1FF; |
37 | #else | 41 | #else |
38 | return adc_read(ADC_EXT_POWER) > 0x100; | 42 | /* Player */ |
39 | #endif | ||
40 | #else | ||
41 | return (PADR & 1) == 0; | 43 | return (PADR & 1) == 0; |
42 | #endif | 44 | #endif /* HAVE_FMADC */ |
45 | #endif /* HAVE_CHARGE_CTRL */ | ||
43 | } | 46 | } |
44 | 47 | ||
45 | void charger_enable(bool on) | 48 | void charger_enable(bool on) |