Merge pull request #537 from lesshonor/q3-merge/fix-2

Q3 merge updates

keyboards/doio/kb04/rules.mk

@@ -22,7 +22,7 @@ LTO_ENABLE = yes
 
 # RGB Matrix enabled
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
 
 # Encoder enabled
 ENCODER_ENABLE = yes
@@ -32,4 +32,4 @@ EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

keyboards/doodboard/duckboard_r2/keymaps/vial/rules.mk

@@ -4,7 +4,7 @@ MOUSEKEY_ENABLE = yes
 CONSOLE_ENABLE = no
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_DRIVER = ws2812
 LTO_ENABLE = yes
 
 # Vial settings

keyboards/dotmod/dymium65/config.h

@@ -1,9 +1,5 @@
-<<<<<<<< HEAD:keyboards/keychron/q7/ansi/keymaps/vial/config.h
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
-========
 /* Copyright 2023 Finalkey
  * Copyright 2023 LiWenLiu <https://github.com/LiuLiuQMK>
->>>>>>>> qmk/master:keyboards/dotmod/dymium65/config.h
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,15 +17,6 @@
 
 #pragma once
 
-<<<<<<<< HEAD:keyboards/keychron/q7/ansi/keymaps/vial/config.h
-#define VIAL_KEYBOARD_UID {0xF4, 0xB4, 0xCC, 0xD0, 0xA0, 0x27, 0xA9, 0xB3}
-
-#define VIAL_UNLOCK_COMBO_ROWS {0, 2}
-#define VIAL_UNLOCK_COMBO_COLS {0, 13}
-
-/* Set dynamic keymap layer counts to 5 */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-========
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -43,4 +30,3 @@
 #define RGB_DISABLE_AFTER_TIMEOUT 0
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
->>>>>>>> qmk/master:keyboards/dotmod/dymium65/config.h

keyboards/durgod/boards/DURGOD_STM32_F070/board.mk

@@ -5,7 +5,7 @@ BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB/board.c
 BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB
 
 # Include mcu configuration
-EXTRAINCDIRS += $(BOARD_PATH)/boards/DURGOD_STM32_F070
+EXTRAINCDIRS = $(BOARD_PATH)/boards/DURGOD_STM32_F070
 
 # Shared variables
 ALLCSRC += $(BOARDSRC)

keyboards/feker/ik75/keymaps/vial/rules.mk

@@ -1,6 +1,7 @@
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
 VIALRGB_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
 
 # Firmware Optimization
 QMK_SETTINGS = no

keyboards/feker/ik75/rules.mk

@@ -20,4 +20,3 @@ RGB_MATRIX_ENABLE = yes
 
 # Encoder enabled
 ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes

keyboards/geekboards/macropad_v2/readme.md

@@ -10,7 +10,7 @@ Hardware Availability: https://geekboards.ru
 
 Compile instruction for this keyboard (after setting up your build environment):
 
-    make geekboards/macropad_v2:vial
+    make geekboards/macropad_v2:via
 
 ## Update firmware
 ### Enter bootloader
@@ -27,6 +27,6 @@ Alternatively:
 
 ### Flash
 
-    make geekboards/macropad_v2:vial:flash
+    make geekboards/macropad_v2:via:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/getawayvan/config.h

@@ -17,37 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xE5CA
-#define PRODUCT_ID      0x0401
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    "esca"
-#define PRODUCT         "GetawayVan"
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A4, A13, A10, C13, C14 }
-#define MATRIX_ROW_PINS { A9, A8, A3, A5 }
-#define DIODE_DIRECTION COL2ROW
-
-#define WS2812_DI_PIN B15
-#define RGB_MATRIX_LED_COUNT 51
-#define RGBLED_NUM 51
 #define WS2812_SPI SPID2
 #define WS2812_SPI_MOSI_PAL_MODE 0
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
 #define WS2812_EXTERNAL_PULLUP
 
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_HUE_STEP 20
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-#define RGBLIGHT_LIMIT_VAL 128
-
-#define DEBOUNCE    5
-
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE

keyboards/getawayvan/info.json

@@ -1,12 +1,95 @@
 {
-    "keyboard_name": "GetawayVan", 
-    "url": "", 
-    "maintainer": "esca", 
-    "width": 12.75, 
-    "height": 4, 
+    "manufacturer": "esca",
+    "keyboard_name": "GetawayVan",
+    "maintainer": "esca",
+    "bootloader": "stm32-dfu",
+    "bootmagic": {
+        "enabled": true
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "extrakey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "matrix_pins": {
+        "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A4", "A13", "A10", "C13", "C14"],
+        "rows": ["A9", "A8", "A3", "A5"]
+    },
+    "mouse_key": {
+        "enabled": true
+    },
+    "processor": "STM32F072",
+    "rgb_matrix": {
+        "driver": "ws2812",
+        "led_count": 51
+    },
+    "rgblight": {
+        "brightness_steps": 17,
+        "hue_steps": 20,
+        "led_count": 51,
+        "max_brightness": 128,
+        "saturation_steps": 17
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0401",
+        "vid": "0xE5CA"
+    },
+    "ws2812": {
+        "driver": "spi",
+        "pin": "B15"
+    },
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"NoNo Key", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"\"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3, "w":1.25}, {"label":"Alt", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":2.75}, {"label":"", "x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}]
+            "layout": [
+                {"label": "esc", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "Q", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "W", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "E", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "R", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "T", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "Y", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "U", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "I", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "O", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "P", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "NoNo Key", "matrix": [0, 11], "x": 11, "y": 0, "w": 1.75},
+                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"label": "A", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "S", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "D", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "F", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "G", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "H", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "J", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "L", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "\"", "matrix": [1, 10], "x": 10.25, "y": 1},
+                {"label": "Enter", "matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5},
+                {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "Z", "matrix": [2, 1], "x": 1.75, "y": 2},
+                {"label": "X", "matrix": [2, 2], "x": 2.75, "y": 2},
+                {"label": "C", "matrix": [2, 3], "x": 3.75, "y": 2},
+                {"label": "V", "matrix": [2, 4], "x": 4.75, "y": 2},
+                {"label": "B", "matrix": [2, 5], "x": 5.75, "y": 2},
+                {"label": "N", "matrix": [2, 6], "x": 6.75, "y": 2},
+                {"label": "M", "matrix": [2, 7], "x": 7.75, "y": 2},
+                {"label": "<", "matrix": [2, 8], "x": 8.75, "y": 2},
+                {"label": ">", "matrix": [2, 9], "x": 9.75, "y": 2},
+                {"label": "K2a", "matrix": [2, 10], "x": 10.75, "y": 2},
+                {"label": "Shift", "matrix": [2, 11], "x": 11.75, "y": 2},
+                {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 3},
+                {"label": "Win", "matrix": [3, 1], "x": 1, "y": 3, "w": 1.25},
+                {"label": "Alt", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "", "matrix": [3, 4], "x": 3.25, "y": 3, "w": 2.75},
+                {"label": "", "matrix": [3, 6], "x": 6, "y": 3, "w": 2.25},
+                {"label": "Alt", "matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25},
+                {"label": "K39", "matrix": [3, 9], "x": 9.75, "y": 3},
+                {"label": "K3a", "matrix": [3, 10], "x": 10.75, "y": 3},
+                {"label": "K3b", "matrix": [3, 11], "x": 11.75, "y": 3}
+            ]
         }
     }
 }

keyboards/getawayvan/rules.mk

@@ -1,14 +1,10 @@
 # MCU name
-MCU = STM32F072
 
 # Bootloader selection
-BOOTLOADER = stm32-dfu
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes
-MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
@@ -22,8 +18,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

keyboards/gizmo_engineering/gk6/keymaps/vial/rules.mk

@@ -1,12 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
 
@@ -16,17 +7,3 @@ QMK_SETTINGS = no
 TAP_DANCE_ENABLE = yes
 COMBO_ENABLE = yes
 KEY_OVERRIDE_ENABLE = no
-
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = IS31FL3731

keyboards/handwired/phantagom/varan/keymaps/via/rules.mk

@@ -1,2 +1 @@
 VIA_ENABLE = yes
-VIAL_ENABLE = yes

keyboards/kb_elmo/sesame/readme.md

@@ -21,4 +21,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 ## Bootloader
 
 * **Bootmagic reset**: Hold down the top left key and plug in the keyboard
-* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the back of the PCB
+* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the back of the PCB