diff options
| author | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-12-06 17:04:10 +0800 |
| commit | 27fc28fd2ff52e079a5bc58d6aaea4c752420615 (patch) | |
| tree | 7ac943fb1ba4f430a7220efd18f66f6a77205c30 /keyboards/keychron/q2/rev_0111/keymaps | |
| parent | e736133392fe6427cfb995da0787337189828272 (diff) | |
| parent | 2709b6ed616f8012ff4cfd3ee69a822a8d188351 (diff) | |
Merge upstream master
Diffstat (limited to 'keyboards/keychron/q2/rev_0111/keymaps')
4 files changed, 19 insertions, 40 deletions
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c index f5a0667601..3079050204 100644 --- a/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c +++ b/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c @@ -72,6 +72,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif + bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case KC_MISSION_CONTROL: diff --git a/keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk b/keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk new file mode 100644 index 0000000000..a40474b4d5 --- /dev/null +++ b/keyboards/keychron/q2/rev_0111/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes
\ No newline at end of file diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c index a22143eb02..b6a5b5ff31 100644 --- a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c +++ b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c @@ -72,46 +72,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) }; -#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE) - -#define ENCODERS 1 -static uint8_t encoder_state[ENCODERS] = {0}; -static keypos_t encoder_cw[ENCODERS] = {{ 8, 4 }}; -static keypos_t encoder_ccw[ENCODERS] = {{ 7, 4 }}; - -void encoder_action_register(uint8_t index, bool clockwise) { - keyevent_t encoder_event = (keyevent_t) { - .key = clockwise ? encoder_cw[index] : encoder_ccw[index], - .pressed = true, - .time = (timer_read() | 1) - }; - encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); - action_exec(encoder_event); -} - -void encoder_action_unregister(void) { - for (int index = 0; index < ENCODERS; ++index) { - if (encoder_state[index]) { - keyevent_t encoder_event = (keyevent_t) { - .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], - .pressed = false, - .time = (timer_read() | 1) - }; - encoder_state[index] = 0; - action_exec(encoder_event); - } - } -} - -void matrix_scan_user(void) { - encoder_action_unregister(); -} - -bool encoder_update_user(uint8_t index, bool clockwise) { - encoder_action_register(index, clockwise); - return false; +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [_FN3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, }; - #endif bool process_record_user(uint16_t keycode, keyrecord_t *record) { diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk b/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk index bee21da528..4253f570f0 100644 --- a/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk +++ b/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk @@ -1,2 +1,2 @@ VIA_ENABLE = yes -MOUSEKEY_ENABLE = no
\ No newline at end of file +ENCODER_MAP_ENABLE = yes
\ No newline at end of file |