From 4c5373c8346646664f12ede9e84cd2159e6e4bf0 Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Wed, 13 Jul 2022 01:28:10 -0600 Subject: [PATCH] vial encoders 2 --- keyboards/adalyn/keymaps/vial/rules.mk | 1 - keyboards/bongopad/{kb.c => bongopad.c} | 2 +- keyboards/bongopad/{kb.h => bongopad.h} | 0 keyboards/bongopad/keymaps/vial/keymap.c | 11 +++++-- keyboards/bongopad/keymaps/vial/rules.mk | 2 +- keyboards/boston/keymaps/vial/config.h | 2 -- keyboards/gmmk/pro/ansi/keymaps/vial/rules.mk | 8 ----- keyboards/gmmk/pro/iso/keymaps/vial/rules.mk | 10 ------- .../pro/{ => rev1}/ansi/keymaps/vial/config.h | 1 - .../pro/{ => rev1}/ansi/keymaps/vial/keymap.c | 7 +++++ .../gmmk/pro/rev1/ansi/keymaps/vial/rules.mk | 5 ++++ .../{ => rev1}/ansi/keymaps/vial/vial.json | 0 .../pro/{ => rev1}/iso/keymaps/vial/config.h | 1 - .../pro/{ => rev1}/iso/keymaps/vial/keymap.c | 7 +++++ .../gmmk/pro/rev1/iso/keymaps/vial/rules.mk | 5 ++++ .../pro/{ => rev1}/iso/keymaps/vial/vial.json | 0 .../handwired/snatchpad/keymaps/vial/config.h | 2 -- .../keebio/bdn9/rev2/keymaps/vial/keymap.c | 30 ++++--------------- .../keebio/bdn9/rev2/keymaps/vial/rules.mk | 2 +- .../keebio/kbo5000/keymaps/vial/keymap.c | 28 ++++------------- .../keebio/kbo5000/keymaps/vial/rules.mk | 2 +- .../keycapsss/plaid_pad/keymaps/vial/keymap.c | 7 +++++ .../keycapsss/plaid_pad/keymaps/vial/rules.mk | 2 +- keyboards/kikoslab/kl90/keymaps/vial/keymap.c | 6 ++++ keyboards/kikoslab/kl90/keymaps/vial/rules.mk | 2 +- .../nullbitsco/nibble/keymaps/vial/keymap.c | 7 +++++ .../nullbitsco/nibble/keymaps/vial/rules.mk | 2 +- .../creator_lite/keymaps/vial/keymap.c | 7 +++++ .../creator_lite/keymaps/vial/rules.mk | 2 +- .../creator_pro/keymaps/vial/keymap.c | 7 +++++ .../creator_pro/keymaps/vial/rules.mk | 2 +- keyboards/sofle/keymaps/vial/config.h | 2 -- keyboards/sofle/keymaps/vial/keymap.c | 7 +++++ keyboards/sofle/keymaps/vial/rules.mk | 2 +- .../walletburner/cajal/keymaps/vial/keymap.c | 7 +++++ .../walletburner/cajal/keymaps/vial/rules.mk | 2 +- 36 files changed, 104 insertions(+), 86 deletions(-) rename keyboards/bongopad/{kb.c => bongopad.c} (79%) rename keyboards/bongopad/{kb.h => bongopad.h} (100%) delete mode 100644 keyboards/gmmk/pro/ansi/keymaps/vial/rules.mk delete mode 100644 keyboards/gmmk/pro/iso/keymaps/vial/rules.mk rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/vial/config.h (96%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/vial/keymap.c (96%) create mode 100644 keyboards/gmmk/pro/rev1/ansi/keymaps/vial/rules.mk rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/vial/vial.json (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vial/config.h (96%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vial/keymap.c (96%) create mode 100644 keyboards/gmmk/pro/rev1/iso/keymaps/vial/rules.mk rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vial/vial.json (100%) diff --git a/keyboards/adalyn/keymaps/vial/rules.mk b/keyboards/adalyn/keymaps/vial/rules.mk index 70cc74551c..3ed0d216fb 100755 --- a/keyboards/adalyn/keymaps/vial/rules.mk +++ b/keyboards/adalyn/keymaps/vial/rules.mk @@ -1,4 +1,3 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = no QMK_SETTINGS = no diff --git a/keyboards/bongopad/kb.c b/keyboards/bongopad/bongopad.c similarity index 79% rename from keyboards/bongopad/kb.c rename to keyboards/bongopad/bongopad.c index 45308a211f..8fae6df3f4 100644 --- a/keyboards/bongopad/kb.c +++ b/keyboards/bongopad/bongopad.c @@ -1,3 +1,3 @@ // Copyright 2021 Ll3macorn (@ll3macorn) // SPDX-License-Identifier: GPL-2.0-or-later -#include "kb.h" +#include "bongopad.h" diff --git a/keyboards/bongopad/kb.h b/keyboards/bongopad/bongopad.h similarity index 100% rename from keyboards/bongopad/kb.h rename to keyboards/bongopad/bongopad.h diff --git a/keyboards/bongopad/keymaps/vial/keymap.c b/keyboards/bongopad/keymaps/vial/keymap.c index e017f6f161..ffa5cbe8f4 100644 --- a/keyboards/bongopad/keymaps/vial/keymap.c +++ b/keyboards/bongopad/keymaps/vial/keymap.c @@ -1,6 +1,6 @@ // Copyright 2021 Ll3macorn (@ll3macorn) // SPDX-License-Identifier: GPL-2.0-or-later -#include "kb.h" +#include QMK_KEYBOARD_H #include enum layers { @@ -174,4 +174,11 @@ bool oled_task_user(void) { } oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }; -#endif \ No newline at end of file +#endif + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/bongopad/keymaps/vial/rules.mk b/keyboards/bongopad/keymaps/vial/rules.mk index 50c8916927..ad68084b94 100644 --- a/keyboards/bongopad/keymaps/vial/rules.mk +++ b/keyboards/bongopad/keymaps/vial/rules.mk @@ -1,6 +1,6 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes LTO_ENABLE = yes COMBO_ENABLE = no QMK_SETTINGS = no diff --git a/keyboards/boston/keymaps/vial/config.h b/keyboards/boston/keymaps/vial/config.h index 16f2ce46cb..87be7bcea7 100644 --- a/keyboards/boston/keymaps/vial/config.h +++ b/keyboards/boston/keymaps/vial/config.h @@ -2,8 +2,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 7 -#define VIAL_ENCODER_KEYCODE_DELAY 10 - #define VIAL_KEYBOARD_UID {0xB3, 0x30, 0xE4, 0x75, 0xF9, 0x3A, 0x9B, 0x18} #define VIAL_UNLOCK_COMBO_ROWS {1, 4} diff --git a/keyboards/gmmk/pro/ansi/keymaps/vial/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/vial/rules.mk deleted file mode 100644 index d9ae765ea5..0000000000 --- a/keyboards/gmmk/pro/ansi/keymaps/vial/rules.mk +++ /dev/null @@ -1,8 +0,0 @@ -VIA_ENABLE=yes -VIAL_ENABLE=yes - -VIALRGB_ENABLE=yes -VIAL_ENCODERS_ENABLE = yes - -#define VIAL_UNLOCK_ROWS { 1,3 } -#define VIAL_UNLOCK_COLS { 10,4 } diff --git a/keyboards/gmmk/pro/iso/keymaps/vial/rules.mk b/keyboards/gmmk/pro/iso/keymaps/vial/rules.mk deleted file mode 100644 index 7952d241ef..0000000000 --- a/keyboards/gmmk/pro/iso/keymaps/vial/rules.mk +++ /dev/null @@ -1,10 +0,0 @@ -VIA_ENABLE=yes -VIAL_ENABLE=yes - -VIALRGB_ENABLE=yes -VIAL_ENCODERS_ENABLE = yes - -BOOTMAGIC_ENABLE = lite - -#define VIAL_UNLOCK_ROWS { 1,3 } -#define VIAL_UNLOCK_COLS { 10,4 } diff --git a/keyboards/gmmk/pro/ansi/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h similarity index 96% rename from keyboards/gmmk/pro/ansi/keymaps/vial/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h index 0a8130d96a..ac8394c30a 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/vial/config.h +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h @@ -31,4 +31,3 @@ #define VIAL_KEYBOARD_UID {0x03, 0x75, 0x3D, 0xEC, 0x97, 0xC2, 0xE9, 0x9A} #define VIAL_UNLOCK_COMBO_ROWS { 1, 10 } #define VIAL_UNLOCK_COMBO_COLS { 3, 4 } -#define VIAL_ENCODER_KEYCODE_DELAY 25 diff --git a/keyboards/gmmk/pro/ansi/keymaps/vial/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/keymap.c similarity index 96% rename from keyboards/gmmk/pro/ansi/keymaps/vial/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/vial/keymap.c index a061a85e40..d96431de96 100644 --- a/keyboards/gmmk/pro/ansi/keymaps/vial/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/keymap.c @@ -76,3 +76,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/rules.mk new file mode 100644 index 0000000000..eff4146741 --- /dev/null +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE=yes +VIAL_ENABLE=yes + +VIALRGB_ENABLE=yes +ENCODER_MAP_ENABLE=yes diff --git a/keyboards/gmmk/pro/ansi/keymaps/vial/vial.json b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/vial.json similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/vial/vial.json rename to keyboards/gmmk/pro/rev1/ansi/keymaps/vial/vial.json diff --git a/keyboards/gmmk/pro/iso/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h similarity index 96% rename from keyboards/gmmk/pro/iso/keymaps/vial/config.h rename to keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h index aec3990df3..f6add7756d 100644 --- a/keyboards/gmmk/pro/iso/keymaps/vial/config.h +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h @@ -31,4 +31,3 @@ #define VIAL_KEYBOARD_UID {0xEC, 0xFE, 0x5D, 0x44, 0x1A, 0x9C, 0x70, 0xCC} #define VIAL_UNLOCK_COMBO_ROWS { 1, 10 } #define VIAL_UNLOCK_COMBO_COLS { 3, 4 } -#define VIAL_ENCODER_KEYCODE_DELAY 25 diff --git a/keyboards/gmmk/pro/iso/keymaps/vial/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/keymap.c similarity index 96% rename from keyboards/gmmk/pro/iso/keymaps/vial/keymap.c rename to keyboards/gmmk/pro/rev1/iso/keymaps/vial/keymap.c index babfbcffbd..da3578530c 100644 --- a/keyboards/gmmk/pro/iso/keymaps/vial/keymap.c +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/keymap.c @@ -76,3 +76,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; // clang-format on + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/rules.mk b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/rules.mk new file mode 100644 index 0000000000..eff4146741 --- /dev/null +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE=yes +VIAL_ENABLE=yes + +VIALRGB_ENABLE=yes +ENCODER_MAP_ENABLE=yes diff --git a/keyboards/gmmk/pro/iso/keymaps/vial/vial.json b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/vial.json similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/vial/vial.json rename to keyboards/gmmk/pro/rev1/iso/keymaps/vial/vial.json diff --git a/keyboards/handwired/snatchpad/keymaps/vial/config.h b/keyboards/handwired/snatchpad/keymaps/vial/config.h index bd595e3e09..236f69602d 100644 --- a/keyboards/handwired/snatchpad/keymaps/vial/config.h +++ b/keyboards/handwired/snatchpad/keymaps/vial/config.h @@ -6,5 +6,3 @@ #define VIAL_KEYBOARD_UID {0x35, 0xEB, 0x39, 0xAE, 0x97, 0x53, 0xAB, 0x92} #define VIAL_UNLOCK_COMBO_ROWS { 0, 0, 0 } #define VIAL_UNLOCK_COMBO_COLS { 0, 1, 2 } - -#define VIAL_ENCODER_KEYCODE_DELAY 10 diff --git a/keyboards/keebio/bdn9/rev2/keymaps/vial/keymap.c b/keyboards/keebio/bdn9/rev2/keymaps/vial/keymap.c index 7c380a4fdd..8b67d7ebc1 100644 --- a/keyboards/keebio/bdn9/rev2/keymaps/vial/keymap.c +++ b/keyboards/keebio/bdn9/rev2/keymaps/vial/keymap.c @@ -41,27 +41,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == _LEFT) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } - else if (index == _MIDDLE) { - if (clockwise) { - tap_code(KC_DOWN); - } else { - tap_code(KC_UP); - } - } - else if (index == _RIGHT) { - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - } - return true; -} +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/keebio/bdn9/rev2/keymaps/vial/rules.mk b/keyboards/keebio/bdn9/rev2/keymaps/vial/rules.mk index 3a7ae30ded..69ad5a2ad8 100644 --- a/keyboards/keebio/bdn9/rev2/keymaps/vial/rules.mk +++ b/keyboards/keebio/bdn9/rev2/keymaps/vial/rules.mk @@ -3,7 +3,7 @@ COMMAND_ENABLE = no VIALRGB_ENABLE = yes TAP_DANCE_ENABLE = yes ENCODER_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes VIA_ENABLE = yes VIAL_ENABLE = yes diff --git a/keyboards/keebio/kbo5000/keymaps/vial/keymap.c b/keyboards/keebio/kbo5000/keymaps/vial/keymap.c index 11075faf6f..ef8747ce66 100644 --- a/keyboards/keebio/kbo5000/keymaps/vial/keymap.c +++ b/keyboards/keebio/kbo5000/keymaps/vial/keymap.c @@ -35,25 +35,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == LEFT_HALF_ENC) { - if (clockwise) { - tap_code(KC_PGDN); - } else { - tap_code(KC_PGUP); - } - } else if (index == RIGHT_HALF_ENC1) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - } else if (index == RIGHT_HALF_ENC2) { - if (clockwise) { - tap_code(KC_DOWN); - } else { - tap_code(KC_UP); - } - } - return true; -} +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/keebio/kbo5000/keymaps/vial/rules.mk b/keyboards/keebio/kbo5000/keymaps/vial/rules.mk index 478112628a..1d7c5e9257 100644 --- a/keyboards/keebio/kbo5000/keymaps/vial/rules.mk +++ b/keyboards/keebio/kbo5000/keymaps/vial/rules.mk @@ -1,7 +1,7 @@ VIA_ENABLE = yes LTO_ENABLE = yes VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes QMK_SETTINGS = no COMBO_ENABLE = no diff --git a/keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c index c4c6c05ecd..846c39b96a 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c +++ b/keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c @@ -118,3 +118,10 @@ Rev1.1 Rev1 return true; } #endif + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/keycapsss/plaid_pad/keymaps/vial/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/vial/rules.mk index 2a8e8f8608..5b7c05adb0 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/vial/rules.mk +++ b/keyboards/keycapsss/plaid_pad/keymaps/vial/rules.mk @@ -1,4 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/kikoslab/kl90/keymaps/vial/keymap.c b/keyboards/kikoslab/kl90/keymaps/vial/keymap.c index 04af4ba925..8fd354b892 100644 --- a/keyboards/kikoslab/kl90/keymaps/vial/keymap.c +++ b/keyboards/kikoslab/kl90/keymaps/vial/keymap.c @@ -144,3 +144,9 @@ void oled_task_user(void) { render_anim(); } #endif + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/kikoslab/kl90/keymaps/vial/rules.mk b/keyboards/kikoslab/kl90/keymaps/vial/rules.mk index 4fb953bfdf..db082e0ec3 100644 --- a/keyboards/kikoslab/kl90/keymaps/vial/rules.mk +++ b/keyboards/kikoslab/kl90/keymaps/vial/rules.mk @@ -1,4 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes WPM_ENABLE = yes \ No newline at end of file diff --git a/keyboards/nullbitsco/nibble/keymaps/vial/keymap.c b/keyboards/nullbitsco/nibble/keymaps/vial/keymap.c index c0f48e9352..a8cb9340c8 100644 --- a/keyboards/nullbitsco/nibble/keymaps/vial/keymap.c +++ b/keyboards/nullbitsco/nibble/keymaps/vial/keymap.c @@ -51,3 +51,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/nullbitsco/nibble/keymaps/vial/rules.mk b/keyboards/nullbitsco/nibble/keymaps/vial/rules.mk index 36b5a42d4e..56987d9dac 100644 --- a/keyboards/nullbitsco/nibble/keymaps/vial/rules.mk +++ b/keyboards/nullbitsco/nibble/keymaps/vial/rules.mk @@ -2,5 +2,5 @@ VIA_ENABLE = yes QMK_SETTINGS = no VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/sergiopoverony/creator_lite/keymaps/vial/keymap.c b/keyboards/sergiopoverony/creator_lite/keymaps/vial/keymap.c index de60fcc538..841d00a689 100644 --- a/keyboards/sergiopoverony/creator_lite/keymaps/vial/keymap.c +++ b/keyboards/sergiopoverony/creator_lite/keymaps/vial/keymap.c @@ -63,3 +63,10 @@ layer_state_t layer_state_set_user(layer_state_t state) } return state; }; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/sergiopoverony/creator_lite/keymaps/vial/rules.mk b/keyboards/sergiopoverony/creator_lite/keymaps/vial/rules.mk index 2c5ee8206c..996491567d 100644 --- a/keyboards/sergiopoverony/creator_lite/keymaps/vial/rules.mk +++ b/keyboards/sergiopoverony/creator_lite/keymaps/vial/rules.mk @@ -1,4 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes QMK_SETTINGS = no diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/vial/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/vial/keymap.c index 337e077a49..2b0fa1888b 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/vial/keymap.c +++ b/keyboards/sergiopoverony/creator_pro/keymaps/vial/keymap.c @@ -47,3 +47,10 @@ layer_state_t layer_state_set_user(layer_state_t state) } return state; }; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk b/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk index c224117d29..ae4cb83ec7 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/keymaps/vial/rules.mk @@ -1,6 +1,6 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes QMK_SETTINGS = no COMBO_ENABLE = no KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/sofle/keymaps/vial/config.h b/keyboards/sofle/keymaps/vial/config.h index 62a8e7c168..ab24087f55 100644 --- a/keyboards/sofle/keymaps/vial/config.h +++ b/keyboards/sofle/keymaps/vial/config.h @@ -26,5 +26,3 @@ // The four corners #define VIAL_UNLOCK_COMBO_ROWS { 0, 5, 3, 8 } #define VIAL_UNLOCK_COMBO_COLS { 0, 0, 0, 0 } - -#define ENCODER_RESOLUTIONS { 4, 2 } diff --git a/keyboards/sofle/keymaps/vial/keymap.c b/keyboards/sofle/keymaps/vial/keymap.c index 168360ddde..ee9a474212 100644 --- a/keyboards/sofle/keymaps/vial/keymap.c +++ b/keyboards/sofle/keymaps/vial/keymap.c @@ -113,3 +113,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/sofle/keymaps/vial/rules.mk b/keyboards/sofle/keymaps/vial/rules.mk index 6aea4e3a07..743ed6ccff 100644 --- a/keyboards/sofle/keymaps/vial/rules.mk +++ b/keyboards/sofle/keymaps/vial/rules.mk @@ -4,7 +4,7 @@ CONSOLE_ENABLE = no EXTRAKEY_ENABLE = yes VIA_ENABLE = yes VIAL_ENABLE = yes -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes LTO_ENABLE = yes RGBLIGHT_ENABLE = no QMK_SETTINGS = no diff --git a/keyboards/walletburner/cajal/keymaps/vial/keymap.c b/keyboards/walletburner/cajal/keymaps/vial/keymap.c index 404757efc2..10c68f9b24 100644 --- a/keyboards/walletburner/cajal/keymaps/vial/keymap.c +++ b/keyboards/walletburner/cajal/keymaps/vial/keymap.c @@ -75,3 +75,10 @@ layer_state_t layer_state_set_user(layer_state_t state) { } return state; } + +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; diff --git a/keyboards/walletburner/cajal/keymaps/vial/rules.mk b/keyboards/walletburner/cajal/keymaps/vial/rules.mk index 67e450ec70..190663c8d0 100644 --- a/keyboards/walletburner/cajal/keymaps/vial/rules.mk +++ b/keyboards/walletburner/cajal/keymaps/vial/rules.mk @@ -3,5 +3,5 @@ VIAL_ENABLE = yes LTO_ENABLE = yes QMK_SETTINGS = no -VIAL_ENCODERS_ENABLE = yes +ENCODER_MAP_ENABLE = yes KEY_OVERRIDE_ENABLE = no