refactor: modernize vial examples (#717)

vial-kb · Apr 15, 2024 · f834a41 · f834a41
1 parent ba4efcd
commit f834a41
Show file tree

Hide file tree

Showing 33 changed files with 170 additions and 385 deletions.
diff --git a/keyboards/vial_example/vial_atmega32u4/config.h b/keyboards/vial_example/vial_atmega32u4/config.h
diff --git a/keyboards/vial_example/vial_atmega32u4/info.json 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
@@ -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
@@ -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
@@ -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
diff --git a/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h b/keyboards/vial_example/vial_atmega32u4/vial_atmega32u4.h
diff --git a/keyboards/vial_example/vial_rp2040/config.h b/keyboards/vial_example/vial_rp2040/config.h
diff --git a/keyboards/vial_example/vial_rp2040/info.json 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
@@ -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
@@ -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
diff --git a/keyboards/vial_example/vial_rp2040/vial_rp2040.h b/keyboards/vial_example/vial_rp2040/vial_rp2040.h
diff --git a/keyboards/vial_example/vial_stm32f072/config.h b/keyboards/vial_example/vial_stm32f072/config.h
diff --git a/keyboards/vial_example/vial_stm32f072/info.json 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
@@ -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
@@ -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
@@ -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
diff --git a/keyboards/vial_example/vial_stm32f072/vial_stm32f072.h b/keyboards/vial_example/vial_stm32f072/vial_stm32f072.h