From 2886c335a0e8a9bb6b6549e648ece7e51519f787 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 30 Nov 2023 10:19:17 +1100 Subject: `keycapsss/plaid_pad`: switch to encoder map (#22474) --- keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c | 61 ++++------------------ 1 file changed, 11 insertions(+), 50 deletions(-) (limited to 'keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c') diff --git a/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c index 7d48591cd2..4ca3fc944b 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c +++ b/keyboards/keycapsss/plaid_pad/keymaps/via/keymap.c @@ -27,26 +27,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | 0 | . | = | + | * `-----------------------' */ - [0] = LAYOUT_ortho_4x4( + LAYOUT_ortho_4x4( KC_P7, KC_P8, KC_P9, KC_PSLS, KC_P4, KC_P5, KC_P6, KC_PAST, KC_P1, KC_P2, KC_P3, KC_PMNS, - KC_P0, KC_PDOT, KC_PEQL, KC_PPLS ), - [1] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), + KC_P0, KC_PDOT, KC_PEQL, KC_PPLS + ), }; @@ -69,8 +55,7 @@ bool oled_task_user(void) { #endif -#ifdef ENCODER_ENABLE -bool encoder_update_user(uint8_t index, bool clockwise) { +#ifdef ENCODER_MAP_ENABLE /* Rev1.1 Rev1 ,-----------------------, ,-----------------------, @@ -84,35 +69,11 @@ Rev1.1 Rev1 `-----------------------' `-----------------------' */ - // First encoder (E1) - if (index == 0) { - if (clockwise) { - tap_code(KC_F17); - } else { - tap_code(KC_F18); - } - // Second encoder (E2) - } else if (index == 1) { - if (clockwise) { - tap_code(KC_F19); - } else { - tap_code(KC_F20); - } - // Third encoder (E3) - } else if (index == 2) { - if (clockwise) { - tap_code(KC_F21); - } else { - tap_code(KC_F22); - } - // Forth encoder (E4) - } else if (index == 3) { - if (clockwise) { - tap_code(KC_F23); - } else { - tap_code(KC_F24); - } - } - return true; -} +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { +#ifdef KEYBOARD_keycapsss_plaid_pad_rev1 + { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19) } +#else + { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_F22, KC_F21), ENCODER_CCW_CW(KC_F24, KC_F23) } +#endif +}; #endif -- cgit v1.2.3