From 972b3ae35d12503b4bed600b57a0b8184ff6154d Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Sat, 20 Apr 2024 23:31:01 -0600 Subject: [PATCH] fix vial keymaps --- keyboards/crkbd/keymaps/vial/config.h | 4 ++-- keyboards/crkbd/keymaps/vial/rules.mk | 2 +- keyboards/ergodox_ez/base/keymaps/vial/rules.mk | 1 + keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h | 1 - keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h | 1 - .../maple_computing/lets_split_eh/keymaps/vial/keymap.c | 8 ++++---- .../maple_computing/lets_split_eh/keymaps/vial/rules.mk | 2 +- keyboards/mt/split75/keymaps/vial/config.h | 2 +- keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil | 1 - keyboards/wavtype/p01_ultra/keymaps/vial/config.h | 4 +++- 10 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil diff --git a/keyboards/crkbd/keymaps/vial/config.h b/keyboards/crkbd/keymaps/vial/config.h index 10362968727..a4e7d7da1c5 100644 --- a/keyboards/crkbd/keymaps/vial/config.h +++ b/keyboards/crkbd/keymaps/vial/config.h @@ -39,9 +39,9 @@ along with this program. If not, see . #define USE_SERIAL_PD2 #ifdef RGBLIGHT_ENABLE -# undef RGBLED_NUM +# undef RGBLIGHT_LED_COUNT # define RGBLIGHT_ANIMATIONS -# define RGBLED_NUM 54 +# define RGBLIGHT_LED_COUNT 54 # undef RGBLED_SPLIT # define RGBLED_SPLIT \ { 27, 27 } diff --git a/keyboards/crkbd/keymaps/vial/rules.mk b/keyboards/crkbd/keymaps/vial/rules.mk index 76001860ad6..10ed8a57e69 100644 --- a/keyboards/crkbd/keymaps/vial/rules.mk +++ b/keyboards/crkbd/keymaps/vial/rules.mk @@ -7,7 +7,7 @@ RGB_MATRIX_ENABLE = no # Can't have RGBLIGHT and RGB_MATRIX at the same time. MOUSEKEY_ENABLE = no OLED_ENABLE = no OLED_DRIVER = SSD1306 -EXTRAKEY_ENABLE = yes +EXTRAKEY_ENABLE = no COMBO_ENABLE = no QMK_SETTINGS = no diff --git a/keyboards/ergodox_ez/base/keymaps/vial/rules.mk b/keyboards/ergodox_ez/base/keymaps/vial/rules.mk index 2e31796d1b5..595326ed775 100644 --- a/keyboards/ergodox_ez/base/keymaps/vial/rules.mk +++ b/keyboards/ergodox_ez/base/keymaps/vial/rules.mk @@ -1,3 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes KEY_OVERRIDE_ENABLE = no +QMK_SETTINGS = no diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h index 00e66fa38c3..7229d0b2e79 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h @@ -19,7 +19,6 @@ #define DRIVER_1_LED_TOTAL 66 #define DRIVER_2_LED_TOTAL 32 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) //enable RGB Matrix Effects for Vial #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h index 5948625784a..0ff5fc0a1e6 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h @@ -19,7 +19,6 @@ #define DRIVER_1_LED_TOTAL 66 #define DRIVER_2_LED_TOTAL 33 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) //enable RGB Matrix Effects for Vial #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/vial/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/vial/keymap.c index 4a959e32cec..dbeee07dc0a 100644 --- a/keyboards/maple_computing/lets_split_eh/keymaps/vial/keymap.c +++ b/keyboards/maple_computing/lets_split_eh/keymaps/vial/keymap.c @@ -93,16 +93,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef RGBLIGHT_LAYERS const rgblight_segment_t PROGMEM my_layerQW_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_OFF} + {0, RGBLIGHT_LED_COUNT, HSV_OFF} ); const rgblight_segment_t PROGMEM my_layerLW_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_CYAN} + {0, RGBLIGHT_LED_COUNT, HSV_CYAN} ); const rgblight_segment_t PROGMEM my_layerRS_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_RED} + {0, RGBLIGHT_LED_COUNT, HSV_RED} ); const rgblight_segment_t PROGMEM my_layerAD_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, RGBLED_NUM, HSV_GREEN} + {0, RGBLIGHT_LED_COUNT, HSV_GREEN} ); // Now define the array of layers. Later layers take precedence diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/vial/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/vial/rules.mk index 46e3d41ae69..679629b1e17 100644 --- a/keyboards/maple_computing/lets_split_eh/keymaps/vial/rules.mk +++ b/keyboards/maple_computing/lets_split_eh/keymaps/vial/rules.mk @@ -1,7 +1,7 @@ # Build options BACKLIGHT_ENABLE = no BOOTMAGIC_ENABLE = yes -COMBO_ENABLE = yes +COMBO_ENABLE = no KEY_OVERRIDE_ENABLE = no LTO_ENABLE = yes MOUSEKEY_ENABLE = no diff --git a/keyboards/mt/split75/keymaps/vial/config.h b/keyboards/mt/split75/keymaps/vial/config.h index 0edac283984..a70bf91d17c 100644 --- a/keyboards/mt/split75/keymaps/vial/config.h +++ b/keyboards/mt/split75/keymaps/vial/config.h @@ -17,4 +17,4 @@ #define VIAL_UNLOCK_COMBO_ROWS { 5, 6 } #define VIAL_UNLOCK_COMBO_COLS { 0, 11 } -#define RGB_MATRIX_LED_COUNT RGBLED_NUM +#define RGB_MATRIX_LED_COUNT RGBLIGHT_LED_COUNT diff --git a/keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil b/keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil deleted file mode 100644 index fbfe79ba7a1..00000000000 --- a/keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "uid": -1, "layout": [[["KC_ESCAPE", -1, "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", -1, "KC_F9", "KC_F10", "KC_F11", "KC_F12", "KC_PSCREEN", "KC_SCROLLLOCK", "KC_PAUSE"], ["KC_GRAVE", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINUS", "KC_EQUAL", "KC_BSPACE", -1, "KC_INSERT", "KC_HOME", "KC_PGUP"], ["KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRACKET", "KC_RBRACKET", "KC_BSLASH", -1, "KC_DELETE", "KC_END", "KC_PGDOWN"], ["KC_CAPSLOCK", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCOLON", "KC_QUOTE", -1, "KC_ENTER", "KC_NO", -1, -1, -1], ["KC_LSHIFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMMA", "KC_DOT", "KC_SLASH", -1, -1, "KC_RSHIFT", "KC_NO", -1, "KC_UP", -1], ["KC_LCTRL", "KC_LGUI", "KC_LALT", -1, -1, -1, "KC_SPACE", -1, -1, -1, "KC_RGUI", -1, "MO(1)", -1, "KC_RCTRL", "KC_LEFT", "KC_DOWN", "KC_RIGHT"]], [["KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "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_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_TRNS"], ["KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RESET", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, "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", -1, "KC_TRNS", "KC_NO", -1, -1, -1], ["KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUI", "RGB_SAI", "RGB_VAI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", -1, -1, "KC_TRNS", "KC_NO", -1, "KC_VOLU", -1], ["KC_TRNS", "KC_TRNS", "KC_TRNS", -1, -1, -1, "KC_TRNS", -1, -1, -1, "KC_TRNS", -1, "KC_TRNS", -1, "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_TRNS"]]], "encoder_layout": [[], []], "layout_options": 0, "macro": [[], [], [], [], [], [], [], [], [], [], [], [], [], [], [], []], "vial_protocol": -1, "via_protocol": 9} \ No newline at end of file diff --git a/keyboards/wavtype/p01_ultra/keymaps/vial/config.h b/keyboards/wavtype/p01_ultra/keymaps/vial/config.h index 0d44202e5a1..9a91adfe05c 100644 --- a/keyboards/wavtype/p01_ultra/keymaps/vial/config.h +++ b/keyboards/wavtype/p01_ultra/keymaps/vial/config.h @@ -4,4 +4,6 @@ #define VIAL_KEYBOARD_UID {0xAF, 0xD3, 0xD3, 0xB9, 0xA1, 0x5C, 0x47, 0x8F} #define VIAL_UNLOCK_COMBO_ROWS {1, 2} -#define VIAL_UNLOCK_COMBO_COLS {0, 15} \ No newline at end of file +#define VIAL_UNLOCK_COMBO_COLS {0, 15} + +#define DYNAMIC_KEYMAP_LAYER_COUNT 2