fix vial keymaps

keeb-it · Apr 21, 2024 · 2071045 · 2071045
1 parent eb32093
commit 2071045
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git 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 <http://www.gnu.org/licenses/>.
 
 #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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/thevankeyboards/minivan/keymaps/vial/config.h b/keyboards/thevankeyboards/minivan/keymaps/vial/config.h
@@ -27,7 +27,7 @@
 #define USB_MAX_POWER_CONSUMPTION 100
 #define PERMISSIVE_HOLD
 #define RGB_DI_PIN D0
-#define RGBLED_NUM 3
+#define RGBLIGHT_LED_COUNT 3
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_SLEEP
 #define IS_COMMAND() ( keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) )

diff --git a/keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil b/keyboards/wavtype/p01_ultra/keymaps/vial/MAIN.vil
diff --git 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}
+#define VIAL_UNLOCK_COMBO_COLS {0, 15}
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2