fix: various builds (#483)

vial-kb · Jun 18, 2023 · f57e09e · f57e09e
1 parent 0b5cd38
commit f57e09e
Show file tree

Hide file tree

Showing 19 changed files with 1,084 additions and 1,208 deletions.
diff --git a/keyboards/alpha/keymaps/vial/config.h b/keyboards/alpha/keymaps/vial/config.h
@@ -7,7 +7,15 @@
 #define VIAL_UNLOCK_COMBO_ROWS { 0, 0 }
 #define VIAL_UNLOCK_COMBO_COLS { 0, 9 }
 
-#undef RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#if defined(__AVR_ATmega32U4__)
+    #undef LOCKING_SUPPORT_ENABLE
+    #undef LOCKING_RESYNC_ENABLE
+
+    #undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+    #undef RGBLIGHT_EFFECT_SNAKE
+    #undef RGBLIGHT_EFFECT_CHRISTMAS
+    #undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+    #undef RGBLIGHT_EFFECT_RGB_TEST
+    #undef RGBLIGHT_EFFECT_ALTERNATING
+    #undef RGBLIGHT_EFFECT_TWINKLE
+#endif
diff --git a/keyboards/alpha/keymaps/vial/keymap.c b/keyboards/alpha/keymaps/vial/keymap.c
@@ -6,7 +6,7 @@
 #define OTHER 3
 
 enum custom_keycodes {
-	MACRO1 = SAFE_RANGE
+	MACRO1 = QK_KB_0
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {

diff --git a/keyboards/alpha/keymaps/vial/vial.json b/keyboards/alpha/keymaps/vial/vial.json
@@ -3,52 +3,59 @@
     "vendorId": "0xFEED",
     "productId": "0x6060",
     "lighting": "qmk_rgblight",
+    "customKeycodes": [
+        {
+            "name": "MACRO1",
+            "title": ":'(",
+            "shortName": "SORRY"
+        }
+    ],
     "matrix": {
         "rows": 3,
         "cols": 10
     },
     "layouts": {
         "keymap":[
             [
-              "0,0",
-              "0,1",
-              "0,2",
-              "0,3",
-              "0,4",
-              "0,5",
-              "0,6",
-              "0,7",
-              "0,8",
-              "0,9"
+                "0,0",
+                "0,1",
+                "0,2",
+                "0,3",
+                "0,4",
+                "0,5",
+                "0,6",
+                "0,7",
+                "0,8",
+                "0,9"
             ],
             [
-              "1,0",
-              "1,1",
-              "1,2",
-              "1,3",
-              "1,4",
-              "1,5",
-              "1,6",
-              "1,7",
-              "1,8",
-              "1,9"
+                "1,0",
+                "1,1",
+                "1,2",
+                "1,3",
+                "1,4",
+                "1,5",
+                "1,6",
+                "1,7",
+                "1,8",
+                "1,9"
             ],
             [
-              {
-                "x": 0.5
-              },
-              "2,0",
-              "2,1",
-              "2,2",
-              "2,3",
-              {
-                "w": 2
-              },
-              "2,5",
-              "2,7",
-              "2,8",
-              "2,9"
+                {
+                    "x": 0.5
+                },
+                "2,0",
+                "2,1",
+                "2,2",
+                "2,3",
+                {
+                    "w": 2
+                },
+                "2,5",
+                "2,7",
+                "2,8",
+                "2,9"
             ]
-          ]
+        ]
     }
 }
diff --git a/keyboards/capsunlocked/cu7/keymaps/vial/config.h b/keyboards/capsunlocked/cu7/keymaps/vial/config.h
@@ -1,5 +1,11 @@
 #pragma once
 
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
+
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+
 #define VIAL_KEYBOARD_UID {0x19, 0xFF, 0xE1, 0x15, 0x74, 0x04, 0x69, 0x00}
 #define VIAL_UNLOCK_COMBO_ROWS { 1, 1 }
 #define VIAL_UNLOCK_COMBO_COLS { 0, 2 }
diff --git a/keyboards/capsunlocked/cu7/keymaps/vial/keymap.c b/keyboards/capsunlocked/cu7/keymaps/vial/keymap.c
@@ -25,22 +25,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              _______,
     RGB_MOD, KC_UP,   QK_BOOT,
     KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-  [2] = LAYOUT(
-             _______,
-    _______, _______, _______,
-    _______, _______, _______
-  ),
-  [3] = LAYOUT(
-             _______,
-    _______, _______, _______,
-    _______, _______, _______
-  ),
+  )
 };
 
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [0] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
-    [1] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
-    [2] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
-    [3] = { ENCODER_CCW_CW(KC_NO, KC_NO) },
+    [1] = { ENCODER_CCW_CW(KC_NO, KC_NO) }
 };
diff --git a/keyboards/controllerworks/mini36/keymaps/vial/keymap.json b/keyboards/controllerworks/mini36/keymaps/vial/keymap.json
diff --git a/keyboards/crkbd/keymaps/vial/rules.mk b/keyboards/crkbd/keymaps/vial/rules.mk
@@ -1,11 +1,13 @@
-MOUSEKEY_ENABLE     = no      # Mouse keys
-RGBLIGHT_ENABLE     = yes     # Enable WS2812 RGB underlight.
-VIA_ENABLE          = yes     # Enable VIA
-VIAL_ENABLE         = yes     # Enable VIAL
+VIA_ENABLE          = yes
+VIAL_ENABLE         = yes
+LTO_ENABLE          = yes
+
+RGBLIGHT_ENABLE     = yes
+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
-LTO_ENABLE          = yes
-QMK_SETTINGS        = no
 COMBO_ENABLE        = no
 
+QMK_SETTINGS        = no
diff --git a/keyboards/helix/rev2/keymaps/vial/config.h b/keyboards/helix/rev2/keymaps/vial/config.h
@@ -26,7 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #if defined(LED_ANIMATIONS)
    #define RGBLIGHT_EFFECT_BREATHING
-   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 
    #undef RGBLIGHT_EFFECT_RGB_TEST
    #undef RGBLIGHT_EFFECT_ALTERNATING

diff --git a/keyboards/keycapsss/3w6_2040/config.h b/keyboards/keycapsss/3w6_2040/config.h
@@ -8,7 +8,6 @@
 #define SERIAL_USART_PIN_SWAP     // Swap TX and RX pins if keyboard is master halve.
 #define SERIAL_USART_SPEED 921600 // Sped :)
 #define USB_VBUS_PIN GP19         // for rp2040 | When USB_VBUS_PIN is not defined, SPLIT_USB_DETECT is used.
-#define EE_HANDS                  // Split handedness via eeprom
 #define SPLIT_LED_STATE_ENABLE    // Sync host leds (caps lock, ...)
 #define SPLIT_LAYER_STATE_ENABLE  // Enables syncing of the layer state between both halves
 #define SPLIT_POINTING_ENABLE     // Transmitting the pointing device status to the master side
@@ -21,5 +20,4 @@
 #define RGBLIGHT_DEFAULT_VAR 255
 #define RGBLIGHT_DEFAULT_SPD 2
 
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
+#define DYNAMIC_KEYMAP_LAYER_COUNT 9
diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/info.json
@@ -2,29 +2,27 @@
     "manufacturer": "Keycapsss",
     "keyboard_name": "3w6 RP2040",
     "maintainer": "Keycapsss",
-    "url": "https://keycapsss.com",
-    "processor": "RP2040",
     "bootloader": "rp2040",
     "bootloader_instructions": "Press and hold the boot button while plugging in the keyboard",
-    "usb": {
-        "vid": "0x7983",
-        "pid": "0x3357",
-        "device_version": "1.0.0"
-    },
+    "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
         "command": false,
         "console": true,
         "extrakey": true,
         "mousekey": true,
-        "pointing_device": true,
         "nkro": true,
+        "pointing_device": true,
         "rgblight": true
     },
-    "debounce": 5,
     "indicators": {
         "caps_lock": "GP17"
     },
+    "matrix_pins": {
+        "cols": ["GP8", "GP9", "GP10", "GP11", "GP12"],
+        "rows": ["GP4", "GP5", "GP6", "GP7"]
+    },
+    "processor": "RP2040",
     "rgblight": {
         "animations": {
             "alternating": true,
@@ -42,64 +40,65 @@
         "hue_steps": 8,
         "led_count": 2,
         "max_brightness": 100,
-        "pin": "GP25",
         "saturation_steps": 8,
         "split_count": [1, 1]
     },
-    "diode_direction": "COL2ROW",
-    "matrix_pins": {
-        "cols": ["GP8", "GP9", "GP10", "GP11", "GP12"],
-        "rows": ["GP4", "GP5", "GP6", "GP7"]
-    },
-    "matrix_size": {
-        "cols": 5,
-        "rows": 8
-    },
     "split": {
         "enabled": true,
+        "main": "eeprom",
         "transport": {
             "protocol": "serial"
         }
     },
+    "url": "https://keycapsss.com",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x3357",
+        "vid": "0x7983"
+    },
+    "ws2812": {
+        "driver": "vendor",
+        "pin": "GP25"
+    },
     "layouts": {
         "LAYOUT_split_3x5_3": {
             "layout": [
-                { "label": "L00", "matrix": [0, 0], "x": 0, "y": 0.75 },
-                { "label": "L01", "matrix": [0, 1], "x": 1, "y": 0.25 },
-                { "label": "L02", "matrix": [0, 2], "x": 2, "y": 0 },
-                { "label": "L03", "matrix": [0, 3], "x": 3, "y": 0.25 },
-                { "label": "L04", "matrix": [0, 4], "x": 4, "y": 0.5 },
-                { "label": "R04", "matrix": [4, 4], "x": 8.75, "y": 0.5 },
-                { "label": "R03", "matrix": [4, 3], "x": 9.75, "y": 0.25 },
-                { "label": "R02", "matrix": [4, 2], "x": 10.75, "y": 0 },
-                { "label": "R01", "matrix": [4, 1], "x": 11.75, "y": 0.25 },
-                { "label": "R00", "matrix": [4, 0], "x": 12.75, "y": 0.75 },
-                { "label": "L10", "matrix": [1, 0], "x": 0, "y": 1.75 },
-                { "label": "L11", "matrix": [1, 1], "x": 1, "y": 1.25 },
-                { "label": "L12", "matrix": [1, 2], "x": 2, "y": 1 },
-                { "label": "L13", "matrix": [1, 3], "x": 3, "y": 1.25 },
-                { "label": "L14", "matrix": [1, 4], "x": 4, "y": 1.5 },
-                { "label": "R14", "matrix": [5, 4], "x": 8.75, "y": 1.5 },
-                { "label": "R13", "matrix": [5, 3], "x": 9.75, "y": 1.25 },
-                { "label": "R12", "matrix": [5, 2], "x": 10.75, "y": 1 },
-                { "label": "R11", "matrix": [5, 1], "x": 11.75, "y": 1.25 },
-                { "label": "R10", "matrix": [5, 0], "x": 12.75, "y": 1.75 },
-                { "label": "L20", "matrix": [2, 0], "x": 0, "y": 2.75 },
-                { "label": "L21", "matrix": [2, 1], "x": 1, "y": 2.25 },
-                { "label": "L22", "matrix": [2, 2], "x": 2, "y": 2 },
-                { "label": "L23", "matrix": [2, 3], "x": 3, "y": 2.25 },
-                { "label": "L24", "matrix": [2, 4], "x": 4, "y": 2.5 },
-                { "label": "R24", "matrix": [6, 4], "x": 8.75, "y": 2.5 },
-                { "label": "R23", "matrix": [6, 3], "x": 9.75, "y": 2.25 },
-                { "label": "R22", "matrix": [6, 2], "x": 10.75, "y": 2 },
-                { "label": "R21", "matrix": [6, 1], "x": 11.75, "y": 2.25 },
-                { "label": "R20", "matrix": [6, 0], "x": 12.75, "y": 2.75 },
-                { "label": "L32", "matrix": [3, 2], "x": 2.75, "y": 3.5 },
-                { "label": "L33", "matrix": [3, 3], "x": 4, "y": 3.75 },
-                { "label": "L34", "matrix": [3, 4], "x": 5.25, "y": 3.5, "h":1.5 },
-                { "label": "R34", "matrix": [7, 4], "x": 7.5, "y": 3.5, "h":1.5 },
-                { "label": "R33", "matrix": [7, 3], "x": 8.75, "y": 3.75 },
-                { "label": "R32", "matrix": [7, 2], "x": 10, "y": 3.5 }
+                {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.75},
+                {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.25},
+                {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0.25},
+                {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.5},
+                {"label": "R04", "matrix": [4, 4], "x": 8.75, "y": 0.5},
+                {"label": "R03", "matrix": [4, 3], "x": 9.75, "y": 0.25},
+                {"label": "R02", "matrix": [4, 2], "x": 10.75, "y": 0},
+                {"label": "R01", "matrix": [4, 1], "x": 11.75, "y": 0.25},
+                {"label": "R00", "matrix": [4, 0], "x": 12.75, "y": 0.75},
+                {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.75},
+                {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.25},
+                {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1},
+                {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1.25},
+                {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.5},
+                {"label": "R14", "matrix": [5, 4], "x": 8.75, "y": 1.5},
+                {"label": "R13", "matrix": [5, 3], "x": 9.75, "y": 1.25},
+                {"label": "R12", "matrix": [5, 2], "x": 10.75, "y": 1},
+                {"label": "R11", "matrix": [5, 1], "x": 11.75, "y": 1.25},
+                {"label": "R10", "matrix": [5, 0], "x": 12.75, "y": 1.75},
+                {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.75},
+                {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.25},
+                {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2},
+                {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2.25},
+                {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.5},
+                {"label": "R24", "matrix": [6, 4], "x": 8.75, "y": 2.5},
+                {"label": "R23", "matrix": [6, 3], "x": 9.75, "y": 2.25},
+                {"label": "R22", "matrix": [6, 2], "x": 10.75, "y": 2},
+                {"label": "R21", "matrix": [6, 1], "x": 11.75, "y": 2.25},
+                {"label": "R20", "matrix": [6, 0], "x": 12.75, "y": 2.75},
+                {"label": "L32", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3.75},
+                {"label": "L34", "matrix": [3, 4], "x": 5.25, "y": 3.5, "h": 1.5},
+                {"label": "R34", "matrix": [7, 4], "x": 7.5, "y": 3.5, "h": 1.5},
+                {"label": "R33", "matrix": [7, 3], "x": 8.75, "y": 3.75},
+                {"label": "R32", "matrix": [7, 2], "x": 10, "y": 3.5}
             ]
         }
     }

diff --git a/keyboards/keycapsss/3w6_2040/rules.mk b/keyboards/keycapsss/3w6_2040/rules.mk
@@ -1,4 +1,3 @@
 SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
 POINTING_DEVICE_DRIVER = pimoroni_trackball
 PIMORONI_TRACKBALL_ADDRESS = 0x0A
diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/vial/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/vial/config.h
@@ -14,3 +14,4 @@
 #undef RGBLIGHT_EFFECT_CHRISTMAS
 #undef RGBLIGHT_EFFECT_RGB_TEST
 #undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_SNAKE