From f1f441aa32bf8805bed8a8173b7050a2f49aa102 Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Sat, 9 Sep 2023 01:38:34 -0400 Subject: [PATCH] fix: broken/outdated firmware --- keyboards/doio/kb04/rules.mk | 4 +- .../duckboard_r2/keymaps/vial/rules.mk | 2 +- keyboards/getawayvan/config.h | 26 ----- keyboards/getawayvan/info.json | 95 +++++++++++++++++-- keyboards/getawayvan/rules.mk | 6 -- .../gk6/keymaps/vial/rules.mk | 23 ----- keyboards/mt/split75/keymaps/vial/rules.mk | 2 +- keyboards/velocifire/sun20pro/info.json | 4 +- 8 files changed, 95 insertions(+), 67 deletions(-) diff --git a/keyboards/doio/kb04/rules.mk b/keyboards/doio/kb04/rules.mk index a7c5acf8f53..ab192232629 100644 --- a/keyboards/doio/kb04/rules.mk +++ b/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 \ No newline at end of file +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE diff --git a/keyboards/doodboard/duckboard_r2/keymaps/vial/rules.mk b/keyboards/doodboard/duckboard_r2/keymaps/vial/rules.mk index f0daca5a9a7..9506340a670 100644 --- a/keyboards/doodboard/duckboard_r2/keymaps/vial/rules.mk +++ b/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 diff --git a/keyboards/getawayvan/config.h b/keyboards/getawayvan/config.h index 41544af8fa6..3d253afc06f 100644 --- a/keyboards/getawayvan/config.h +++ b/keyboards/getawayvan/config.h @@ -17,37 +17,11 @@ along with this program. If not, see . #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 diff --git a/keyboards/getawayvan/info.json b/keyboards/getawayvan/info.json index 16e5f438139..b3d86335543 100644 --- a/keyboards/getawayvan/info.json +++ b/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} + ] } } } diff --git a/keyboards/getawayvan/rules.mk b/keyboards/getawayvan/rules.mk index 96d14c0045a..6d69ade46ba 100644 --- a/keyboards/getawayvan/rules.mk +++ b/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 diff --git a/keyboards/gizmo_engineering/gk6/keymaps/vial/rules.mk b/keyboards/gizmo_engineering/gk6/keymaps/vial/rules.mk index a4ef3930cbd..2609a11d841 100644 --- a/keyboards/gizmo_engineering/gk6/keymaps/vial/rules.mk +++ b/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 diff --git a/keyboards/mt/split75/keymaps/vial/rules.mk b/keyboards/mt/split75/keymaps/vial/rules.mk index f4a97e31c9e..b18ec7691c2 100644 --- a/keyboards/mt/split75/keymaps/vial/rules.mk +++ b/keyboards/mt/split75/keymaps/vial/rules.mk @@ -7,4 +7,4 @@ LTO_ENABLE = yes BACKLIGHT_ENABLE = no RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 +RGB_MATRIX_DRIVER = ws2812 diff --git a/keyboards/velocifire/sun20pro/info.json b/keyboards/velocifire/sun20pro/info.json index 6c30ff2e6a3..6244eb5e22a 100644 --- a/keyboards/velocifire/sun20pro/info.json +++ b/keyboards/velocifire/sun20pro/info.json @@ -9,7 +9,7 @@ }, "processor": "atmega32u4", "rgb_matrix": { - "driver": "WS2812" + "driver": "ws2812" }, "url": "", "usb": { @@ -20,4 +20,4 @@ "ws2812": { "pin": "C7" } -} \ No newline at end of file +}