diff options
author | QMK Bot <hello@qmk.fm> | 2021-12-15 04:54:21 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-12-15 04:54:21 +0000 |
commit | c0bb15315170f9265143833ad879b7c8f87b06ac (patch) | |
tree | 3a61a9cec73aac6c0172af3bf48efda147dedef9 /users/drashna/drashna.c | |
parent | 3c5b9f70f5faf9215d654b4f5d92c1ea6b34248a (diff) | |
parent | 3fa592a4024a24a636fa0c562e6761667a94f565 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users/drashna/drashna.c')
-rw-r--r-- | users/drashna/drashna.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index 7e07a2c7c5..9c1233ed90 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c @@ -70,7 +70,9 @@ void matrix_init_user(void) { DDRB &= ~(1 << 0); PORTB &= ~(1 << 0); #endif - +#ifdef CUSTOM_UNICODE_ENABLE + matrix_init_unicode(); +#endif matrix_init_secret(); matrix_init_keymap(); } @@ -152,6 +154,9 @@ void matrix_scan_user(void) { #if defined(RGB_MATRIX_ENABLE) matrix_scan_rgb_matrix(); #endif +#if defined(POINTING_DEVICE_ENABLE) + matrix_scan_pointing(); +#endif matrix_scan_secret(); @@ -171,6 +176,9 @@ layer_state_t layer_state_set_user(layer_state_t state) { } state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); +#if defined(POINTING_DEVICE_ENABLE) + state = layer_state_set_pointing(state); +#endif #if defined(RGBLIGHT_ENABLE) state = layer_state_set_rgb_light(state); #endif // RGBLIGHT_ENABLE |