From f834a41deab7f36658baa09e436b4744bda03596 Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Sun, 14 Apr 2024 21:40:41 -0400 Subject: [PATCH] refactor: modernize vial examples (#717) --- .../vial_example/vial_atmega32u4/config.h | 27 --------------- .../vial_example/vial_atmega32u4/info.json | 33 +++++++++++++++++++ .../vial_atmega32u4/keymaps/vial/keymap.c | 10 ------ .../vial_atmega32u4/keymaps/vial/vial.json | 1 - .../vial_example/vial_atmega32u4/rules.mk | 23 +------------ .../vial_atmega32u4/vial_atmega32u4.c | 3 -- .../vial_atmega32u4/vial_atmega32u4.h | 13 -------- keyboards/vial_example/vial_rp2040/config.h | 24 -------------- keyboards/vial_example/vial_rp2040/info.json | 33 +++++++++++++++++++ .../vial_rp2040/keymaps/vial/keymap.c | 10 ------ keyboards/vial_example/vial_rp2040/rules.mk | 24 +------------- .../vial_example/vial_rp2040/vial_rp2040.c | 3 -- .../vial_example/vial_rp2040/vial_rp2040.h | 13 -------- .../vial_example/vial_stm32f072/config.h | 27 --------------- .../vial_example/vial_stm32f072/info.json | 33 +++++++++++++++++++ .../vial_stm32f072/keymaps/vial/keymap.c | 10 ------ .../vial_stm32f072/keymaps/vial/vial.json | 1 - .../vial_example/vial_stm32f072/rules.mk | 27 +-------------- .../vial_stm32f072/vial_stm32f072.c | 3 -- .../vial_stm32f072/vial_stm32f072.h | 13 -------- .../vial_example/vial_stm32f103_vibl/config.h | 24 -------------- .../vial_stm32f103_vibl/info.json | 33 +++++++++++++++++++ .../vial_stm32f103_vibl/keymaps/vial/keymap.c | 10 ------ .../keymaps/vial/vial.json | 1 - .../vial_example/vial_stm32f103_vibl/rules.mk | 27 +-------------- .../vial_stm32f103_vibl/vial_stm32f103_vibl.c | 3 -- .../vial_stm32f103_vibl/vial_stm32f103_vibl.h | 13 -------- .../vial_example/vial_stm32f401/config.h | 27 --------------- .../vial_example/vial_stm32f401/info.json | 33 +++++++++++++++++++ .../vial_stm32f401/keymaps/vial/keymap.c | 10 ------ .../vial_example/vial_stm32f401/rules.mk | 27 +-------------- .../vial_stm32f401/vial_stm32f401.c | 3 -- .../vial_stm32f401/vial_stm32f401.h | 13 -------- 33 files changed, 170 insertions(+), 385 deletions(-) delete mode 100644 keyboards/vial_example/vial_atmega32u4/config.h create mode 100644 keyboards/vial_example/vial_atmega32u4/info.json delete mode 100644 keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.c delete mode 100644 keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h delete mode 100644 keyboards/vial_example/vial_rp2040/config.h create mode 100644 keyboards/vial_example/vial_rp2040/info.json delete mode 100644 keyboards/vial_example/vial_rp2040/vial_rp2040.c delete mode 100644 keyboards/vial_example/vial_rp2040/vial_rp2040.h delete mode 100644 keyboards/vial_example/vial_stm32f072/config.h create mode 100644 keyboards/vial_example/vial_stm32f072/info.json delete mode 100644 keyboards/vial_example/vial_stm32f072/vial_stm32f072.c delete mode 100644 keyboards/vial_example/vial_stm32f072/vial_stm32f072.h create mode 100644 keyboards/vial_example/vial_stm32f103_vibl/info.json delete mode 100644 keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.c delete mode 100644 keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.h delete mode 100644 keyboards/vial_example/vial_stm32f401/config.h create mode 100644 keyboards/vial_example/vial_stm32f401/info.json delete mode 100644 keyboards/vial_example/vial_stm32f401/vial_stm32f401.c delete mode 100644 keyboards/vial_example/vial_stm32f401/vial_stm32f401.h diff --git a/keyboards/vial_example/vial_atmega32u4/config.h b/keyboards/vial_example/vial_atmega32u4/config.h deleted file mode 100644 index f0718a34fe..0000000000 --- a/keyboards/vial_example/vial_atmega32u4/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER "Vial" -#define PRODUCT "ATmega32u4 example" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 - -#define MATRIX_ROW_PINS { D7, E6 } -#define MATRIX_COL_PINS { B4, B5 } - -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* Use 1000hz polling */ -#define USB_POLLING_INTERVAL_MS 1 diff --git a/keyboards/vial_example/vial_atmega32u4/info.json b/keyboards/vial_example/vial_atmega32u4/info.json new file mode 100644 index 0000000000..edca7bfc7f --- /dev/null +++ b/keyboards/vial_example/vial_atmega32u4/info.json @@ -0,0 +1,33 @@ +{ + "manufacturer": "Vial", + "keyboard_name": "ATmega32u4 example", + "maintainer": "xyz", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B4", "B5"], + "rows": ["D7", "E6"] + }, + "processor": "atmega32u4", + "usb": { + "device_version": "0.0.1", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0} + ] + } + } +} diff --git a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/keymap.c b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/keymap.c index c8fb892589..6c76cbf73d 100644 --- a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/keymap.c +++ b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/keymap.c @@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_A, KC_B, KC_C, KC_D - ), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/vial.json b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/vial.json index 513be6e2ce..7525baeac5 100644 --- a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/vial.json +++ b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/vial.json @@ -1,5 +1,4 @@ { - "name": "Vial ATmega32u4 Example", "matrix": { "rows": 2, "cols": 2 diff --git a/keyboards/vial_example/vial_atmega32u4/rules.mk b/keyboards/vial_example/vial_atmega32u4/rules.mk index 0592d11fd1..6e7633bfe0 100644 --- a/keyboards/vial_example/vial_atmega32u4/rules.mk +++ b/keyboards/vial_example/vial_atmega32u4/rules.mk @@ -1,22 +1 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output +# This file intentionally left blank diff --git a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.c b/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.c deleted file mode 100644 index be5b4a824e..0000000000 --- a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.c +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include "vial_atmega32u4.h" diff --git a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h b/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h deleted file mode 100644 index 12c2bedb5f..0000000000 --- a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, \ - K10, K11 \ -) { \ - { K00, K01 }, \ - { K10, K11 } \ -} diff --git a/keyboards/vial_example/vial_rp2040/config.h b/keyboards/vial_example/vial_rp2040/config.h deleted file mode 100644 index c0564cd69a..0000000000 --- a/keyboards/vial_example/vial_rp2040/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER "Vial" -#define PRODUCT "RP2040 example" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 - -#define MATRIX_ROW_PINS { GP2, GP4 } -#define MATRIX_COL_PINS { GP3, GP5 } - -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/vial_example/vial_rp2040/info.json b/keyboards/vial_example/vial_rp2040/info.json new file mode 100644 index 0000000000..2387a88ba6 --- /dev/null +++ b/keyboards/vial_example/vial_rp2040/info.json @@ -0,0 +1,33 @@ +{ + "manufacturer": "Vial", + "keyboard_name": "RP2040 example", + "maintainer": "xyz", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["GP3", "GP5"], + "rows": ["GP2", "GP4"] + }, + "processor": "RP2040", + "usb": { + "device_version": "0.0.1", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0} + ] + } + } +} diff --git a/keyboards/vial_example/vial_rp2040/keymaps/vial/keymap.c b/keyboards/vial_example/vial_rp2040/keymaps/vial/keymap.c index c8fb892589..6c76cbf73d 100644 --- a/keyboards/vial_example/vial_rp2040/keymaps/vial/keymap.c +++ b/keyboards/vial_example/vial_rp2040/keymaps/vial/keymap.c @@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_A, KC_B, KC_C, KC_D - ), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/vial_example/vial_rp2040/rules.mk b/keyboards/vial_example/vial_rp2040/rules.mk index 34863972e2..6e7633bfe0 100644 --- a/keyboards/vial_example/vial_rp2040/rules.mk +++ b/keyboards/vial_example/vial_rp2040/rules.mk @@ -1,23 +1 @@ -# MCU name -MCU = RP2040 -BOOTLOADER = rp2040 - -# 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +# This file intentionally left blank diff --git a/keyboards/vial_example/vial_rp2040/vial_rp2040.c b/keyboards/vial_example/vial_rp2040/vial_rp2040.c deleted file mode 100644 index 2ffcfd355d..0000000000 --- a/keyboards/vial_example/vial_rp2040/vial_rp2040.c +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include "vial_rp2040.h" diff --git a/keyboards/vial_example/vial_rp2040/vial_rp2040.h b/keyboards/vial_example/vial_rp2040/vial_rp2040.h deleted file mode 100644 index 12c2bedb5f..0000000000 --- a/keyboards/vial_example/vial_rp2040/vial_rp2040.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, \ - K10, K11 \ -) { \ - { K00, K01 }, \ - { K10, K11 } \ -} diff --git a/keyboards/vial_example/vial_stm32f072/config.h b/keyboards/vial_example/vial_stm32f072/config.h deleted file mode 100644 index 9221a958ad..0000000000 --- a/keyboards/vial_example/vial_stm32f072/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER "Vial" -#define PRODUCT "STM32F072 example" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 - -#define MATRIX_ROW_PINS { B10, B11 } -#define MATRIX_COL_PINS { B1, B0 } - -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* Use 1000hz polling */ -#define USB_POLLING_INTERVAL_MS 1 diff --git a/keyboards/vial_example/vial_stm32f072/info.json b/keyboards/vial_example/vial_stm32f072/info.json new file mode 100644 index 0000000000..ed850d9266 --- /dev/null +++ b/keyboards/vial_example/vial_stm32f072/info.json @@ -0,0 +1,33 @@ +{ + "manufacturer": "Vial", + "keyboard_name": "STM32F072 example", + "maintainer": "qmk", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B1", "B0"], + "rows": ["B10", "B11"] + }, + "processor": "STM32F072", + "usb": { + "device_version": "0.0.1", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0} + ] + } + } +} diff --git a/keyboards/vial_example/vial_stm32f072/keymaps/vial/keymap.c b/keyboards/vial_example/vial_stm32f072/keymaps/vial/keymap.c index c8fb892589..6c76cbf73d 100644 --- a/keyboards/vial_example/vial_stm32f072/keymaps/vial/keymap.c +++ b/keyboards/vial_example/vial_stm32f072/keymaps/vial/keymap.c @@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_A, KC_B, KC_C, KC_D - ), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/vial_example/vial_stm32f072/keymaps/vial/vial.json b/keyboards/vial_example/vial_stm32f072/keymaps/vial/vial.json index 91738d9d8b..7525baeac5 100644 --- a/keyboards/vial_example/vial_stm32f072/keymaps/vial/vial.json +++ b/keyboards/vial_example/vial_stm32f072/keymaps/vial/vial.json @@ -1,5 +1,4 @@ { - "name": "Vial STM32F072 Example", "matrix": { "rows": 2, "cols": 2 diff --git a/keyboards/vial_example/vial_stm32f072/rules.mk b/keyboards/vial_example/vial_stm32f072/rules.mk index 26beabb1dc..6e7633bfe0 100644 --- a/keyboards/vial_example/vial_stm32f072/rules.mk +++ b/keyboards/vial_example/vial_stm32f072/rules.mk @@ -1,26 +1 @@ -# MCU name -MCU = STM32F072 -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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE +# This file intentionally left blank diff --git a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.c b/keyboards/vial_example/vial_stm32f072/vial_stm32f072.c deleted file mode 100644 index 464f7c54f9..0000000000 --- a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.c +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include "vial_stm32f072.h" diff --git a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.h b/keyboards/vial_example/vial_stm32f072/vial_stm32f072.h deleted file mode 100644 index 12c2bedb5f..0000000000 --- a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, \ - K10, K11 \ -) { \ - { K00, K01 }, \ - { K10, K11 } \ -} diff --git a/keyboards/vial_example/vial_stm32f103_vibl/config.h b/keyboards/vial_example/vial_stm32f103_vibl/config.h index 149d788cb8..dcec5e9870 100644 --- a/keyboards/vial_example/vial_stm32f103_vibl/config.h +++ b/keyboards/vial_example/vial_stm32f103_vibl/config.h @@ -2,29 +2,5 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER "Vial" -#define PRODUCT "STM32F103-vibl example" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 - -#define MATRIX_ROW_PINS { B10, B11 } -#define MATRIX_COL_PINS { B1, B0 } - -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* Use 1000hz polling */ -#define USB_POLLING_INTERVAL_MS 1 - /* Because we use vibl, this has to be defined here instead of under keymaps/vial/config.h */ #define VIAL_KEYBOARD_UID {0x07, 0x30, 0x3E, 0x60, 0x00, 0x62, 0xA3, 0xD4} diff --git a/keyboards/vial_example/vial_stm32f103_vibl/info.json b/keyboards/vial_example/vial_stm32f103_vibl/info.json new file mode 100644 index 0000000000..1e28edc40a --- /dev/null +++ b/keyboards/vial_example/vial_stm32f103_vibl/info.json @@ -0,0 +1,33 @@ +{ + "manufacturer": "Vial", + "keyboard_name": "STM32F103-vibl example", + "maintainer": "xyz", + "bootloader": "vibl", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B1", "B0"], + "rows": ["B10", "B11"] + }, + "processor": "STM32F103", + "usb": { + "device_version": "0.0.1", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0} + ] + } + } +} diff --git a/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/keymap.c b/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/keymap.c index c8fb892589..6c76cbf73d 100644 --- a/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/keymap.c +++ b/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/keymap.c @@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_A, KC_B, KC_C, KC_D - ), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/vial.json b/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/vial.json index a8815e26ff..7525baeac5 100644 --- a/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/vial.json +++ b/keyboards/vial_example/vial_stm32f103_vibl/keymaps/vial/vial.json @@ -1,5 +1,4 @@ { - "name": "Vial STM32F103-vibl Example", "matrix": { "rows": 2, "cols": 2 diff --git a/keyboards/vial_example/vial_stm32f103_vibl/rules.mk b/keyboards/vial_example/vial_stm32f103_vibl/rules.mk index fb6dfdc883..6e7633bfe0 100644 --- a/keyboards/vial_example/vial_stm32f103_vibl/rules.mk +++ b/keyboards/vial_example/vial_stm32f103_vibl/rules.mk @@ -1,26 +1 @@ -# MCU name -MCU = STM32F103 -BOOTLOADER = vibl - -# 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE +# This file intentionally left blank diff --git a/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.c b/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.c deleted file mode 100644 index 9e40994cdd..0000000000 --- a/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.c +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include "vial_stm32f103_vibl.h" diff --git a/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.h b/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.h deleted file mode 100644 index 12c2bedb5f..0000000000 --- a/keyboards/vial_example/vial_stm32f103_vibl/vial_stm32f103_vibl.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, \ - K10, K11 \ -) { \ - { K00, K01 }, \ - { K10, K11 } \ -} diff --git a/keyboards/vial_example/vial_stm32f401/config.h b/keyboards/vial_example/vial_stm32f401/config.h deleted file mode 100644 index 8f20b709ba..0000000000 --- a/keyboards/vial_example/vial_stm32f401/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER "Vial" -#define PRODUCT "STM32F401 example" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 - -#define MATRIX_ROW_PINS { B10, B11 } -#define MATRIX_COL_PINS { B1, B0 } - -#define DIODE_DIRECTION COL2ROW - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* Use 1000hz polling */ -#define USB_POLLING_INTERVAL_MS 1 diff --git a/keyboards/vial_example/vial_stm32f401/info.json b/keyboards/vial_example/vial_stm32f401/info.json new file mode 100644 index 0000000000..1de9419411 --- /dev/null +++ b/keyboards/vial_example/vial_stm32f401/info.json @@ -0,0 +1,33 @@ +{ + "manufacturer": "Vial", + "keyboard_name": "STM32F401 example", + "maintainer": "xyz", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B1", "B0"], + "rows": ["B10", "B11"] + }, + "processor": "STM32F401", + "usb": { + "device_version": "0.0.1", + "pid": "0x0000", + "vid": "0xFEED" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 2, "y": 0}, + {"label": "K11", "matrix": [1, 1], "x": 3, "y": 0} + ] + } + } +} diff --git a/keyboards/vial_example/vial_stm32f401/keymaps/vial/keymap.c b/keyboards/vial_example/vial_stm32f401/keymaps/vial/keymap.c index c8fb892589..6c76cbf73d 100644 --- a/keyboards/vial_example/vial_stm32f401/keymaps/vial/keymap.c +++ b/keyboards/vial_example/vial_stm32f401/keymaps/vial/keymap.c @@ -11,15 +11,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_A, KC_B, KC_C, KC_D - ), - - [2] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/vial_example/vial_stm32f401/rules.mk b/keyboards/vial_example/vial_stm32f401/rules.mk index d96d8afde0..6e7633bfe0 100644 --- a/keyboards/vial_example/vial_stm32f401/rules.mk +++ b/keyboards/vial_example/vial_stm32f401/rules.mk @@ -1,26 +1 @@ -# MCU name -MCU = STM32F401 -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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches - -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE +# This file intentionally left blank diff --git a/keyboards/vial_example/vial_stm32f401/vial_stm32f401.c b/keyboards/vial_example/vial_stm32f401/vial_stm32f401.c deleted file mode 100644 index 8e14bd3387..0000000000 --- a/keyboards/vial_example/vial_stm32f401/vial_stm32f401.c +++ /dev/null @@ -1,3 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include "vial_stm32f401.h" diff --git a/keyboards/vial_example/vial_stm32f401/vial_stm32f401.h b/keyboards/vial_example/vial_stm32f401/vial_stm32f401.h deleted file mode 100644 index 12c2bedb5f..0000000000 --- a/keyboards/vial_example/vial_stm32f401/vial_stm32f401.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, \ - K10, K11 \ -) { \ - { K00, K01 }, \ - { K10, K11 } \ -}