summaryrefslogtreecommitdiff
path: root/firmware/backlight.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/backlight.c')
-rw-r--r--firmware/backlight.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c
index 8a7c4ceb76..a1d8305d4e 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -35,10 +35,8 @@ static char backlight_stack[DEFAULT_STACK_SIZE];
35static char backlight_thread_name[] = "backlight"; 35static char backlight_thread_name[] = "backlight";
36static struct event_queue backlight_queue; 36static struct event_queue backlight_queue;
37 37
38#ifdef HAVE_CHARGE_CTRL
39static bool charger_was_inserted = 0; 38static bool charger_was_inserted = 0;
40static bool backlight_on_when_charging = 0; 39static bool backlight_on_when_charging = 0;
41#endif
42 40
43static int backlight_timer; 41static int backlight_timer;
44static int backlight_timeout = 5; 42static int backlight_timeout = 5;
@@ -58,7 +56,6 @@ void backlight_thread(void)
58 switch(ev.id) 56 switch(ev.id)
59 { 57 {
60 case BACKLIGHT_ON: 58 case BACKLIGHT_ON:
61#ifdef HAVE_CHARGE_CTRL
62 if( backlight_on_when_charging && charger_inserted() ) 59 if( backlight_on_when_charging && charger_inserted() )
63 { 60 {
64 /* Forcing to zero keeps the lights on */ 61 /* Forcing to zero keeps the lights on */
@@ -66,11 +63,11 @@ void backlight_thread(void)
66 } 63 }
67 else 64 else
68 { 65 {
69 backlight_timer = HZ*timeout_value[backlight_timeout]; 66 backlight_timer = HZ*timeout_value[backlight_timeout];
70 } 67 }
71#else 68
72 backlight_timer = HZ*timeout_value[backlight_timeout]; 69 backlight_timer = HZ*timeout_value[backlight_timeout];
73#endif 70
74 if(backlight_timer < 0) 71 if(backlight_timer < 0)
75 { 72 {
76 backlight_timer = 0; /* timer value 0 will not get ticked */ 73 backlight_timer = 0; /* timer value 0 will not get ticked */
@@ -139,14 +136,14 @@ void backlight_set_on_when_charging(bool yesno)
139 136
140void backlight_tick(void) 137void backlight_tick(void)
141{ 138{
142#ifdef HAVE_CHARGE_CTRL 139 bool charger_is_inserted = charger_inserted();
143 bool charger_is_inserted = charger_inserted(); 140 if( backlight_on_when_charging &&
144 if( backlight_on_when_charging && (charger_was_inserted != charger_is_inserted) ) 141 (charger_was_inserted != charger_is_inserted) )
145 { 142 {
146 backlight_on(); 143 backlight_on();
147 } 144 }
148 charger_was_inserted = charger_is_inserted; 145 charger_was_inserted = charger_is_inserted;
149#endif 146
150 if(backlight_timer) 147 if(backlight_timer)
151 { 148 {
152 backlight_timer--; 149 backlight_timer--;