summaryrefslogtreecommitdiffstats
path: root/keyboards/jj40/jj40.c
diff options
context:
space:
mode:
authorKenneth Aloysius <krusli@users.noreply.github.com>2018-02-02 07:30:47 +0100
committerJack Humbert <jack.humb@gmail.com>2018-02-02 07:30:47 +0100
commit9303b42e690f5668e29b874d88e2bb3564bd93a2 (patch)
treeafb5d8b0dfba552370bed95da9ceb86f677a4e00 /keyboards/jj40/jj40.c
parent042a450e24ad84c4a08b9e5435f97fe7bbd653a4 (diff)
downloadqmk_firmware-9303b42e690f5668e29b874d88e2bb3564bd93a2.tar.gz
qmk_firmware-9303b42e690f5668e29b874d88e2bb3564bd93a2.tar.xz
Update personal layouts, free up matrix_scan_user for JJ40 (#2319)
* Add NIU Mini keymap from Planck keymap * Remove old keymap files * Fix README, removed Planck references * Add default layout, move Planck layout to separate folder * Update README * Add my XD60 keymap * Change RShift to slash * Fix keymap: stuck on MO(1) * Move RESET to Fn+Enter * Add: RGB saturation cycle * Add numpad layer to keymap * Fix last case * 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 * Update XD60 keymap * Update: move matrix_scan_kb out from matrix.c to jj40.c (kb-level) * Cleanup for PR * Fix conflict in readme.md for NIU mini * Restore original power consumption figure * Fix: matrix_scan_user() now has to be defined in the keymaps * Add weak `matrix_scan_user` so it does not have to be defined in keymap * Add weak matrix_init_user()
Diffstat (limited to 'keyboards/jj40/jj40.c')
-rw-r--r--keyboards/jj40/jj40.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/keyboards/jj40/jj40.c b/keyboards/jj40/jj40.c
index 9c1775d6a..4affe199b 100644
--- a/keyboards/jj40/jj40.c
+++ b/keyboards/jj40/jj40.c
@@ -34,7 +34,7 @@ extern rgblight_config_t rgblight_config;
// @Override
void matrix_init_kb(void) {
// call user level keymaps, if any
- // matrix_init_user();
+ matrix_init_user();
}
#ifdef BACKLIGHT_ENABLE
@@ -67,7 +67,8 @@ void rgblight_set(void) {
}
bool rgb_init = false;
-void matrix_scan_user(void) {
+
+void matrix_scan_kb(void) {
// if LEDs were previously on before poweroff, turn them back on
if (rgb_init == false && rgblight_config.enable) {
i2c_init();
@@ -76,5 +77,18 @@ void matrix_scan_user(void) {
}
rgblight_task();
+
+ matrix_scan_user();
/* Nothing else for now. */
}
+
+__attribute__((weak)) // overridable
+void matrix_init_user(void) {
+
+}
+
+
+__attribute__((weak)) // overridable
+void matrix_scan_user(void) {
+
+}