diff options
author | Drashna Jaelre <drashna@live.com> | 2022-11-29 11:43:42 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-29 11:43:42 -0800 |
commit | 4a87af0e9af046d5fc00d930476920c0c34a57a7 (patch) | |
tree | cb2da20c670a49b9fcada84822a7bdb2bd144d60 /users/drashna/callbacks.c | |
parent | 8a8000b4ec379448848f561f57bbe2c781376357 (diff) |
[Keymap] Drashna updates for 0.19 (#19175)
* Fix up bastardkb boards since blackpill support is officially added.
* Check for blackpill version, not elite c.
* Add checks in chibiOS config since multiple ARM controllers supported.
* Rework rules.mk for keymaps to better handle arm vs avr support
* Start moving away from `matrix_*_*` functions.
* `housekeeping_task_*` instead of `matrix_scan_*`
* `keyboard_(pre|post)_init_*` instead of `matrix_init_*`
* Add ℂℴmⅈℂ unicode input method.
* Clean up unicode code to be more compact and flexible.
* Remove/move Pro Micro LED commands to userspace and better filter them
* Fixup OLED code
* Use newer quantum keycode functions/preprocessors rather than manual bit manipulation
* Make unicode mode render much more compact/simple.
* Make qmk secrets more self contained
* Remove custom implementation of split watchdog
Diffstat (limited to 'users/drashna/callbacks.c')
-rw-r--r-- | users/drashna/callbacks.c | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c index 40383f124f..c2f1156cee 100644 --- a/users/drashna/callbacks.c +++ b/users/drashna/callbacks.c @@ -20,22 +20,6 @@ void keyboard_pre_init_user(void) { // functions in the keymaps // Call user matrix init, set default RGB colors and then // call the keymap's init function -__attribute__((weak)) void matrix_init_keymap(void) {} -__attribute__((weak)) void matrix_init_secret(void) {} -void matrix_init_user(void) { -#if defined(BOOTLOADER_CATERINA) && defined(__AVR__) && defined(__AVR_ATmega32U4__) - DDRD &= ~(1 << 5); - PORTD &= ~(1 << 5); - - DDRB &= ~(1 << 0); - PORTB &= ~(1 << 0); -#endif -#ifdef CUSTOM_UNICODE_ENABLE - matrix_init_unicode(); -#endif - matrix_init_secret(); - matrix_init_keymap(); -} __attribute__((weak)) void keyboard_post_init_keymap(void) {} void keyboard_post_init_user(void) { @@ -51,6 +35,17 @@ void keyboard_post_init_user(void) { #ifdef I2C_SCANNER_ENABLE keyboard_post_init_i2c(); #endif +#ifdef CUSTOM_UNICODE_ENABLE + keyboard_post_init_unicode(); +#endif + +#if defined(BOOTLOADER_CATERINA) && defined(__AVR__) && defined(__AVR_ATmega32U4__) + DDRD &= ~(1 << 5); + PORTD &= ~(1 << 5); + + DDRB &= ~(1 << 0); + PORTB &= ~(1 << 0); +#endif keyboard_post_init_keymap(); } @@ -106,7 +101,6 @@ void suspend_wakeup_init_user(void) { // No global matrix scan code, so just run keymap's matrix // scan function __attribute__((weak)) void matrix_scan_keymap(void) {} -__attribute__((weak)) void matrix_scan_secret(void) {} void matrix_scan_user(void) { static bool has_ran_yet; if (!has_ran_yet) { @@ -117,9 +111,6 @@ void matrix_scan_user(void) { #ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. run_diablo_macro_check(); #endif // TAP_DANCE_ENABLE -#ifdef CAPS_WORD_ENABLE - caps_word_task(); -#endif #if defined(CUSTOM_RGB_MATRIX) matrix_scan_rgb_matrix(); #endif @@ -129,7 +120,6 @@ void matrix_scan_user(void) { #ifdef CUSTOM_OLED_DRIVER matrix_scan_oled(); #endif - matrix_scan_secret(); matrix_scan_keymap(); } |