diff options
| author | QMK Bot <hello@qmk.fm> | 2022-10-07 05:33:01 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-10-07 05:33:01 +0000 |
| commit | 7c4a0125095bb78bfa322c599cdddfd3704acf17 (patch) | |
| tree | b1075a0ec018e6130bb86475ef250a8e4add83dc /keyboards/keychron/q2/rev_0111 | |
| parent | c9d66bee707c8573b74dad45a1a457b172b249a2 (diff) | |
| parent | ca2f9e4c8f483da93d7c082b4640832912bec76a (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/keychron/q2/rev_0111')
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 |