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 /keyboards/jj40/jj40.c | |
parent | 5b22ddf5262af8860373ce7a3847f912d5947071 (diff) |
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 'keyboards/jj40/jj40.c')
-rw-r--r-- | keyboards/jj40/jj40.c | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/keyboards/jj40/jj40.c b/keyboards/jj40/jj40.c index 6044e83fdf..9c1775d6a1 100644 --- a/keyboards/jj40/jj40.c +++ b/keyboards/jj40/jj40.c @@ -1,5 +1,6 @@ /* Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> +Modified 2018 Kenneth A. <github.com/krusli> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,8 +25,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "i2c.h" -// custom RGB driver +#include "backlight.h" +#include "backlight_custom.h" + extern rgblight_config_t rgblight_config; + +// for keyboard subdirectory level init functions +// @Override +void matrix_init_kb(void) { + // call user level keymaps, if any + // matrix_init_user(); +} + +#ifdef BACKLIGHT_ENABLE +/// Overrides functions in `quantum.c` +void backlight_init_ports(void) { + b_led_init_ports(); +} + +void backlight_task(void) { + b_led_task(); +} + +void backlight_set(uint8_t level) { + b_led_set(level); +} +#endif + +// custom RGB driver void rgblight_set(void) { if (!rgblight_config.enable) { for (uint8_t i=0; i<RGBLED_NUM; i++) { @@ -39,8 +66,15 @@ void rgblight_set(void) { i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM); } -__attribute__ ((weak)) +bool rgb_init = false; void matrix_scan_user(void) { - rgblight_task(); - /* Nothing else for now. */ + // if LEDs were previously on before poweroff, turn them back on + if (rgb_init == false && rgblight_config.enable) { + i2c_init(); + i2c_send(0xb0, (uint8_t*)led, 3 * RGBLED_NUM); + rgb_init = true; + } + + rgblight_task(); + /* Nothing else for now. */ } |