diff options
Diffstat (limited to 'firmware/backlight.c')
-rw-r--r-- | firmware/backlight.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index a0d08f1e83..7cbdeb45e8 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -108,66 +108,66 @@ static int backlight_on_button_hold = 0; | |||
108 | #endif | 108 | #endif |
109 | 109 | ||
110 | #ifdef HAVE_BUTTON_LIGHT | 110 | #ifdef HAVE_BUTTON_LIGHT |
111 | static int button_backlight_timer; | 111 | static int buttonlight_timer; |
112 | static int button_backlight_timeout = 5*HZ; | 112 | static int buttonlight_timeout = 5*HZ; |
113 | 113 | ||
114 | /* internal interface */ | 114 | /* internal interface */ |
115 | static void _button_backlight_on(void) | 115 | static void _buttonlight_on(void) |
116 | { | 116 | { |
117 | #ifndef SIMULATOR | 117 | #ifndef SIMULATOR |
118 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 118 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
119 | __button_backlight_dim(false); | 119 | __buttonlight_dim(false); |
120 | #else | 120 | #else |
121 | __button_backlight_on(); | 121 | __buttonlight_on(); |
122 | #endif | 122 | #endif |
123 | #endif | 123 | #endif |
124 | } | 124 | } |
125 | 125 | ||
126 | void _button_backlight_off(void) | 126 | void _buttonlight_off(void) |
127 | { | 127 | { |
128 | #ifndef SIMULATOR | 128 | #ifndef SIMULATOR |
129 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 129 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
130 | if(button_backlight_timeout>0) | 130 | if(buttonlight_timeout>0) |
131 | __button_backlight_dim(true); | 131 | __buttonlight_dim(true); |
132 | else | 132 | else |
133 | #endif | 133 | #endif |
134 | __button_backlight_off(); | 134 | __buttonlight_off(); |
135 | #endif | 135 | #endif |
136 | } | 136 | } |
137 | 137 | ||
138 | /* Update state of buttonlight according to timeout setting */ | 138 | /* Update state of buttonlight according to timeout setting */ |
139 | static void buttonlight_update_state(void) | 139 | static void buttonlight_update_state(void) |
140 | { | 140 | { |
141 | button_backlight_timer = button_backlight_timeout; | 141 | buttonlight_timer = buttonlight_timeout; |
142 | 142 | ||
143 | /* Buttonlight == OFF in the setting? */ | 143 | /* Buttonlight == OFF in the setting? */ |
144 | if (button_backlight_timer < 0) | 144 | if (buttonlight_timer < 0) |
145 | { | 145 | { |
146 | button_backlight_timer = 0; /* Disable the timeout */ | 146 | buttonlight_timer = 0; /* Disable the timeout */ |
147 | _button_backlight_off(); | 147 | _buttonlight_off(); |
148 | } | 148 | } |
149 | else | 149 | else |
150 | _button_backlight_on(); | 150 | _buttonlight_on(); |
151 | } | 151 | } |
152 | 152 | ||
153 | /* external interface */ | 153 | /* external interface */ |
154 | void button_backlight_on(void) | 154 | void buttonlight_on(void) |
155 | { | 155 | { |
156 | queue_remove_from_head(&backlight_queue, BUTTON_LIGHT_ON); | 156 | queue_remove_from_head(&backlight_queue, BUTTON_LIGHT_ON); |
157 | queue_post(&backlight_queue, BUTTON_LIGHT_ON, 0); | 157 | queue_post(&backlight_queue, BUTTON_LIGHT_ON, 0); |
158 | } | 158 | } |
159 | 159 | ||
160 | void button_backlight_off(void) | 160 | void buttonlight_off(void) |
161 | { | 161 | { |
162 | queue_post(&backlight_queue, BUTTON_LIGHT_OFF, 0); | 162 | queue_post(&backlight_queue, BUTTON_LIGHT_OFF, 0); |
163 | } | 163 | } |
164 | 164 | ||
165 | void button_backlight_set_timeout(int index) | 165 | void buttonlight_set_timeout(int index) |
166 | { | 166 | { |
167 | if((unsigned)index >= sizeof(backlight_timeout_value)) | 167 | if((unsigned)index >= sizeof(backlight_timeout_value)) |
168 | /* if given a weird value, use default */ | 168 | /* if given a weird value, use default */ |
169 | index = 6; | 169 | index = 6; |
170 | button_backlight_timeout = HZ * backlight_timeout_value[index]; | 170 | buttonlight_timeout = HZ * backlight_timeout_value[index]; |
171 | buttonlight_update_state(); | 171 | buttonlight_update_state(); |
172 | } | 172 | } |
173 | 173 | ||
@@ -543,8 +543,8 @@ void backlight_thread(void) | |||
543 | break; | 543 | break; |
544 | 544 | ||
545 | case BUTTON_LIGHT_OFF: | 545 | case BUTTON_LIGHT_OFF: |
546 | button_backlight_timer = 0; | 546 | buttonlight_timer = 0; |
547 | _button_backlight_off(); | 547 | _buttonlight_off(); |
548 | break; | 548 | break; |
549 | #endif | 549 | #endif |
550 | 550 | ||
@@ -597,12 +597,12 @@ static void backlight_tick(void) | |||
597 | } | 597 | } |
598 | #endif /* HAVE_REMOVE_LCD */ | 598 | #endif /* HAVE_REMOVE_LCD */ |
599 | #ifdef HAVE_BUTTON_LIGHT | 599 | #ifdef HAVE_BUTTON_LIGHT |
600 | if (button_backlight_timer) | 600 | if (buttonlight_timer) |
601 | { | 601 | { |
602 | button_backlight_timer--; | 602 | buttonlight_timer--; |
603 | if (button_backlight_timer == 0) | 603 | if (buttonlight_timer == 0) |
604 | { | 604 | { |
605 | button_backlight_off(); | 605 | buttonlight_off(); |
606 | } | 606 | } |
607 | } | 607 | } |
608 | #endif /* HAVE_BUTTON_LIGHT */ | 608 | #endif /* HAVE_BUTTON_LIGHT */ |
@@ -825,7 +825,7 @@ void backlight_init(void) | |||
825 | 825 | ||
826 | void backlight_on(void) {} | 826 | void backlight_on(void) {} |
827 | void backlight_off(void) {} | 827 | void backlight_off(void) {} |
828 | void button_backlight_on(void) {} | 828 | void buttonlight_on(void) {} |
829 | void backlight_set_timeout(int index) {(void)index;} | 829 | void backlight_set_timeout(int index) {(void)index;} |
830 | bool is_backlight_on(void) {return true;} | 830 | bool is_backlight_on(void) {return true;} |
831 | #ifdef HAVE_REMOTE_LCD | 831 | #ifdef HAVE_REMOTE_LCD |