diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/backlight.c | 44 | ||||
-rw-r--r-- | firmware/export/backlight.h | 11 |
2 files changed, 17 insertions, 38 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 78ba492942..f3bba5b8c7 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -89,11 +89,6 @@ static inline void _remote_backlight_off(void) | |||
89 | 89 | ||
90 | #if defined(HAVE_BACKLIGHT) && !defined(BOOTLOADER) | 90 | #if defined(HAVE_BACKLIGHT) && !defined(BOOTLOADER) |
91 | 91 | ||
92 | const signed char backlight_timeout_value[19] = | ||
93 | { | ||
94 | -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 45, 60, 90 | ||
95 | }; | ||
96 | |||
97 | enum { | 92 | enum { |
98 | BACKLIGHT_ON, | 93 | BACKLIGHT_ON, |
99 | BACKLIGHT_OFF, | 94 | BACKLIGHT_OFF, |
@@ -159,12 +154,9 @@ void buttonlight_off(void) | |||
159 | queue_post(&backlight_queue, BUTTON_LIGHT_OFF, 0); | 154 | queue_post(&backlight_queue, BUTTON_LIGHT_OFF, 0); |
160 | } | 155 | } |
161 | 156 | ||
162 | void buttonlight_set_timeout(int index) | 157 | void buttonlight_set_timeout(int value) |
163 | { | 158 | { |
164 | if((unsigned)index >= sizeof(backlight_timeout_value)) | 159 | _buttonlight_timeout = HZ * value; |
165 | /* if given a weird value, use default */ | ||
166 | index = 6; | ||
167 | _buttonlight_timeout = HZ * backlight_timeout_value[index]; | ||
168 | buttonlight_update_state(); | 160 | buttonlight_update_state(); |
169 | } | 161 | } |
170 | 162 | ||
@@ -638,22 +630,16 @@ int backlight_get_current_timeout(void) | |||
638 | return backlight_timeout; | 630 | return backlight_timeout; |
639 | } | 631 | } |
640 | 632 | ||
641 | void backlight_set_timeout(int index) | 633 | void backlight_set_timeout(int value) |
642 | { | 634 | { |
643 | if((unsigned)index >= sizeof(backlight_timeout_value)) | 635 | backlight_timeout_normal = HZ * value; |
644 | /* if given a weird value, use default */ | ||
645 | index = 6; | ||
646 | backlight_timeout_normal = HZ * backlight_timeout_value[index]; | ||
647 | backlight_update_state(); | 636 | backlight_update_state(); |
648 | } | 637 | } |
649 | 638 | ||
650 | #if CONFIG_CHARGING | 639 | #if CONFIG_CHARGING |
651 | void backlight_set_timeout_plugged(int index) | 640 | void backlight_set_timeout_plugged(int value) |
652 | { | 641 | { |
653 | if((unsigned)index >= sizeof(backlight_timeout_value)) | 642 | backlight_timeout_plugged = HZ * value; |
654 | /* if given a weird value, use default */ | ||
655 | index = 6; | ||
656 | backlight_timeout_plugged = HZ * backlight_timeout_value[index]; | ||
657 | backlight_update_state(); | 643 | backlight_update_state(); |
658 | } | 644 | } |
659 | #endif /* CONFIG_CHARGING */ | 645 | #endif /* CONFIG_CHARGING */ |
@@ -710,22 +696,16 @@ void remote_backlight_off(void) | |||
710 | queue_post(&backlight_queue, REMOTE_BACKLIGHT_OFF, 0); | 696 | queue_post(&backlight_queue, REMOTE_BACKLIGHT_OFF, 0); |
711 | } | 697 | } |
712 | 698 | ||
713 | void remote_backlight_set_timeout(int index) | 699 | void remote_backlight_set_timeout(int value) |
714 | { | 700 | { |
715 | if((unsigned)index >= sizeof(backlight_timeout_value)) | 701 | remote_backlight_timeout_normal = HZ * value; |
716 | /* if given a weird value, use default */ | ||
717 | index=6; | ||
718 | remote_backlight_timeout_normal = HZ * backlight_timeout_value[index]; | ||
719 | remote_backlight_update_state(); | 702 | remote_backlight_update_state(); |
720 | } | 703 | } |
721 | 704 | ||
722 | #if CONFIG_CHARGING | 705 | #if CONFIG_CHARGING |
723 | void remote_backlight_set_timeout_plugged(int index) | 706 | void remote_backlight_set_timeout_plugged(int value) |
724 | { | 707 | { |
725 | if((unsigned)index >= sizeof(backlight_timeout_value)) | 708 | remote_backlight_timeout_plugged = HZ * value; |
726 | /* if given a weird value, use default */ | ||
727 | index=6; | ||
728 | remote_backlight_timeout_plugged = HZ * backlight_timeout_value[index]; | ||
729 | remote_backlight_update_state(); | 709 | remote_backlight_update_state(); |
730 | } | 710 | } |
731 | #endif /* CONFIG_CHARGING */ | 711 | #endif /* CONFIG_CHARGING */ |
@@ -805,12 +785,12 @@ void backlight_init(void) | |||
805 | void backlight_on(void) {} | 785 | void backlight_on(void) {} |
806 | void backlight_off(void) {} | 786 | void backlight_off(void) {} |
807 | void buttonlight_on(void) {} | 787 | void buttonlight_on(void) {} |
808 | void backlight_set_timeout(int index) {(void)index;} | 788 | void backlight_set_timeout(int value) {(void)value;} |
809 | bool is_backlight_on(void) {return true;} | 789 | bool is_backlight_on(void) {return true;} |
810 | #ifdef HAVE_REMOTE_LCD | 790 | #ifdef HAVE_REMOTE_LCD |
811 | void remote_backlight_on(void) {} | 791 | void remote_backlight_on(void) {} |
812 | void remote_backlight_off(void) {} | 792 | void remote_backlight_off(void) {} |
813 | void remote_backlight_set_timeout(int index) {(void)index;} | 793 | void remote_backlight_set_timeout(int value) {(void)value;} |
814 | bool is_remote_backlight_on(void) {return true;} | 794 | bool is_remote_backlight_on(void) {return true;} |
815 | #endif /* HAVE_REMOTE_LCD */ | 795 | #endif /* HAVE_REMOTE_LCD */ |
816 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 796 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
diff --git a/firmware/export/backlight.h b/firmware/export/backlight.h index 47fee7d59e..058f7960f9 100644 --- a/firmware/export/backlight.h +++ b/firmware/export/backlight.h | |||
@@ -24,7 +24,7 @@ | |||
24 | bool is_backlight_on(void); | 24 | bool is_backlight_on(void); |
25 | void backlight_on(void); | 25 | void backlight_on(void); |
26 | void backlight_off(void); | 26 | void backlight_off(void); |
27 | void backlight_set_timeout(int index); | 27 | void backlight_set_timeout(int value); |
28 | 28 | ||
29 | #ifdef HAVE_BACKLIGHT | 29 | #ifdef HAVE_BACKLIGHT |
30 | void backlight_init(void); | 30 | void backlight_init(void); |
@@ -36,8 +36,7 @@ void backlight_set_fade_in(int index); | |||
36 | void backlight_set_fade_out(int index); | 36 | void backlight_set_fade_out(int index); |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | void backlight_set_timeout_plugged(int index); | 39 | void backlight_set_timeout_plugged(int value); |
40 | extern const signed char backlight_timeout_value[]; | ||
41 | 40 | ||
42 | #ifdef HAS_BUTTON_HOLD | 41 | #ifdef HAS_BUTTON_HOLD |
43 | void backlight_hold_changed(bool hold_button); | 42 | void backlight_hold_changed(bool hold_button); |
@@ -56,8 +55,8 @@ extern const signed char lcd_sleep_timeout_value[]; | |||
56 | #ifdef HAVE_REMOTE_LCD | 55 | #ifdef HAVE_REMOTE_LCD |
57 | void remote_backlight_on(void); | 56 | void remote_backlight_on(void); |
58 | void remote_backlight_off(void); | 57 | void remote_backlight_off(void); |
59 | void remote_backlight_set_timeout(int index); | 58 | void remote_backlight_set_timeout(int value); |
60 | void remote_backlight_set_timeout_plugged(int index); | 59 | void remote_backlight_set_timeout_plugged(int value); |
61 | bool is_remote_backlight_on(void); | 60 | bool is_remote_backlight_on(void); |
62 | 61 | ||
63 | #ifdef HAS_REMOTE_BUTTON_HOLD | 62 | #ifdef HAS_REMOTE_BUTTON_HOLD |
@@ -82,7 +81,7 @@ void buttonlight_set_brightness(int val); | |||
82 | #ifdef HAVE_BUTTON_LIGHT | 81 | #ifdef HAVE_BUTTON_LIGHT |
83 | void buttonlight_on(void); | 82 | void buttonlight_on(void); |
84 | void buttonlight_off(void); | 83 | void buttonlight_off(void); |
85 | void buttonlight_set_timeout(int index); | 84 | void buttonlight_set_timeout(int value); |
86 | #endif | 85 | #endif |
87 | 86 | ||
88 | /* Private API for use in target tree backlight code only */ | 87 | /* Private API for use in target tree backlight code only */ |