diff options
| author | Kenneth Aloysius <krusli@users.noreply.github.com> | 2018-01-19 08:02:32 +1100 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-01-18 16:02:32 -0500 |
| commit | 365b86357825ebed7012377a5684269760326fd2 (patch) | |
| tree | e54f479c245e1509fa6511114dea037b3999b3a5 /quantum/quantum.c | |
| parent | 5b22ddf5262af8860373ce7a3847f912d5947071 (diff) | |
| download | qmk_firmware-365b86357825ebed7012377a5684269760326fd2.tar.gz qmk_firmware-365b86357825ebed7012377a5684269760326fd2.zip | |
Backlighting for JJ40 and underglow initialisation code (#2260)
* Cleanup Mechmini keymap. Once the custom RGB function is defined, there is no need to manually handle RGB code.
* Change default to KEYMAP_MIT, not KEYMAP_OFFSET
* Add custom RGB code for JJ40
* Reset Mechmini advertised power draw to 500. Will have to test actual maximum power draw later.
* RGB working on JJ40.
* Fix: saturation increase/decrease flipped
* Add new directory for my custom keymap with RGB keycodes
* Swap LAlt and LGUI
* Update JJ40 max power draw with measured value
* Update: fun40 rules.mk to enable underglow; earlier failed Travis CI
* Fix: init RGB LEDs on boot. Also added HHKB-like keymap for XD60.
* Super rudimentary backlight test, init RGB LEDs on boot
* Backlighting works - stays on for now
* Toggling working
* Now can override backlight.c functions. Problem was functions in backlight.c weren't called before due to a lack of matrix_scan_quantum() in matrix.c
* Timers not working
* Delete global.h
* Cleanup
* Compiles
* Good sign: LEDs stop working again
* Handle timer1 overflow
* Progress: fix: forgot to init
* Backlighting fully working now except breathing.
* Revert keymap to original keycodes
* Update XD60 keymap README
* Update JJ40 keymap with backlight toggles
* Breathing working just fine.
* Update references
* Add backlight_set() call
* Cleanup code to disable backlight
* Fix: does not compile
* Fix: missing call to rgblight_task.
* Testing with BACKLIGHT_BREATHING
* Cleanup
* Cleanup comments
* More commenting cleanup.
* Do not enable BACKLIGHT_BREATHING by default
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 88617412c..65fa25961 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -138,13 +138,13 @@ void reset_keyboard(void) { | |||
| 138 | clear_keyboard(); | 138 | clear_keyboard(); |
| 139 | #if defined(MIDI_ENABLE) && defined(MIDI_BASIC) | 139 | #if defined(MIDI_ENABLE) && defined(MIDI_BASIC) |
| 140 | process_midi_all_notes_off(); | 140 | process_midi_all_notes_off(); |
| 141 | #endif | 141 | #endif |
| 142 | #if defined(AUDIO_ENABLE) | 142 | #if defined(AUDIO_ENABLE) |
| 143 | music_all_notes_off(); | 143 | music_all_notes_off(); |
| 144 | uint16_t timer_start = timer_read(); | 144 | uint16_t timer_start = timer_read(); |
| 145 | PLAY_SONG(goodbye_song); | 145 | PLAY_SONG(goodbye_song); |
| 146 | shutdown_user(); | 146 | shutdown_user(); |
| 147 | while(timer_elapsed(timer_start) < 250) | 147 | while(timer_elapsed(timer_start) < 250) |
| 148 | wait_ms(1); | 148 | wait_ms(1); |
| 149 | stop_all_notes(); | 149 | stop_all_notes(); |
| 150 | #else | 150 | #else |
| @@ -885,6 +885,7 @@ void backlight_set(uint8_t level) {} | |||
| 885 | 885 | ||
| 886 | uint8_t backlight_tick = 0; | 886 | uint8_t backlight_tick = 0; |
| 887 | 887 | ||
| 888 | #ifndef BACKLIGHT_CUSTOM_DRIVER | ||
| 888 | void backlight_task(void) { | 889 | void backlight_task(void) { |
| 889 | if ((0xFFFF >> ((BACKLIGHT_LEVELS - get_backlight_level()) * ((BACKLIGHT_LEVELS + 1) / 2))) & (1 << backlight_tick)) { | 890 | if ((0xFFFF >> ((BACKLIGHT_LEVELS - get_backlight_level()) * ((BACKLIGHT_LEVELS + 1) / 2))) & (1 << backlight_tick)) { |
| 890 | #if BACKLIGHT_ON_STATE == 0 | 891 | #if BACKLIGHT_ON_STATE == 0 |
| @@ -905,9 +906,12 @@ void backlight_task(void) { | |||
| 905 | } | 906 | } |
| 906 | backlight_tick = backlight_tick + 1 % 16; | 907 | backlight_tick = backlight_tick + 1 % 16; |
| 907 | } | 908 | } |
| 909 | #endif | ||
| 908 | 910 | ||
| 909 | #ifdef BACKLIGHT_BREATHING | 911 | #ifdef BACKLIGHT_BREATHING |
| 910 | #error "Backlight breathing only available with hardware PWM. Please disable." | 912 | #ifndef BACKLIGHT_CUSTOM_DRIVER |
| 913 | #error "Backlight breathing only available with hardware PWM. Please disable." | ||
| 914 | #endif | ||
| 911 | #endif | 915 | #endif |
| 912 | 916 | ||
| 913 | #else // pwm through timer | 917 | #else // pwm through timer |
| @@ -935,6 +939,7 @@ static inline void set_pwm(uint16_t val) { | |||
| 935 | OCR1x = val; | 939 | OCR1x = val; |
| 936 | } | 940 | } |
| 937 | 941 | ||
| 942 | #ifndef BACKLIGHT_CUSTOM_DRIVER | ||
| 938 | __attribute__ ((weak)) | 943 | __attribute__ ((weak)) |
| 939 | void backlight_set(uint8_t level) { | 944 | void backlight_set(uint8_t level) { |
| 940 | if (level > BACKLIGHT_LEVELS) | 945 | if (level > BACKLIGHT_LEVELS) |
| @@ -952,6 +957,7 @@ void backlight_set(uint8_t level) { | |||
| 952 | } | 957 | } |
| 953 | 958 | ||
| 954 | void backlight_task(void) {} | 959 | void backlight_task(void) {} |
| 960 | #endif // BACKLIGHT_CUSTOM_DRIVER | ||
| 955 | 961 | ||
| 956 | #ifdef BACKLIGHT_BREATHING | 962 | #ifdef BACKLIGHT_BREATHING |
| 957 | 963 | ||
