diff options
31 files changed, 50 insertions, 79 deletions
diff --git a/keyboards/dztech/dz60rgb/v1/rules.mk b/keyboards/dztech/dz60rgb/v1/rules.mk index 22ecf071a7..c1fb17d02d 100644 --- a/keyboards/dztech/dz60rgb/v1/rules.mk +++ b/keyboards/dztech/dz60rgb/v1/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/evyd13/atom47/rev4/info.json b/keyboards/evyd13/atom47/rev4/info.json index 8bdeb751ae..3c64f506a0 100644 --- a/keyboards/evyd13/atom47/rev4/info.json +++ b/keyboards/evyd13/atom47/rev4/info.json @@ -12,7 +12,7 @@ "caps_lock": "D1", "on_state": 0 }, - "processor": "atmega32u4", + "processor": "atmega32u2", "bootloader": "qmk-dfu", "layouts": { "LAYOUT_split_space": { diff --git a/keyboards/evyd13/atom47/rev4/rules.mk b/keyboards/evyd13/atom47/rev4/rules.mk index 3bce3b43af..1eb7c8bd08 100644 --- a/keyboards/evyd13/atom47/rev4/rules.mk +++ b/keyboards/evyd13/atom47/rev4/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = atmega32u2 - # Build Options ENCODER_ENABLE = yes BACKLIGHT_ENABLE = no diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json index 9c69f52fcd..0cebe7aa3f 100644 --- a/keyboards/helix/pico/info.json +++ b/keyboards/helix/pico/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json index 9efe7fdb53..1dde71a9c0 100644 --- a/keyboards/helix/rev2/info.json +++ b/keyboards/helix/rev2/info.json @@ -8,6 +8,8 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json index e5c19a02b5..edd567a335 100644 --- a/keyboards/helix/rev3_4rows/info.json +++ b/keyboards/helix/rev3_4rows/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index 95580e0c08..7ff3a3b521 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk index e5cf469689..8ea71064b2 100644 --- a/keyboards/helix/rules.mk +++ b/keyboards/helix/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/info.json new file mode 100644 index 0000000000..dd190d18ee --- /dev/null +++ b/keyboards/hhkb/ansi/32u2/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u2", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/hhkb/ansi/32u2/rules.mk b/keyboards/hhkb/ansi/32u2/rules.mk index 0c0b4c37c2..95a1d66061 100644 --- a/keyboards/hhkb/ansi/32u2/rules.mk +++ b/keyboards/hhkb/ansi/32u2/rules.mk @@ -1,5 +1,2 @@ -# MCU name -MCU = atmega32u2 - CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration diff --git a/keyboards/hhkb/ansi/32u4/info.json b/keyboards/hhkb/ansi/32u4/info.json new file mode 100644 index 0000000000..042c41f34d --- /dev/null +++ b/keyboards/hhkb/ansi/32u4/info.json @@ -0,0 +1,4 @@ +{ + "processor": "atmega32u4", + "bootloader": "atmel-dfu" +} diff --git a/keyboards/hhkb/ansi/32u4/rules.mk b/keyboards/hhkb/ansi/32u4/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/hhkb/ansi/32u4/rules.mk diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk index 42827a9d0b..efe5ab4456 100644 --- a/keyboards/hhkb/ansi/rules.mk +++ b/keyboards/hhkb/ansi/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -34,3 +28,5 @@ SRC = matrix.c # debug-off: EXTRAFLAGS += -DNO_DEBUG -DNO_PRINT # debug-off: OPT_DEFS := $(filter-out -DCONSOLE_ENABLE,$(OPT_DEFS)) # debug-off: all + +DEFAULT_FOLDER = hhkb/ansi/32u4 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json index e93c3b77b8..f098bdbf95 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -3,6 +3,9 @@ "usb": { "pid": "0xAEC1" }, + "processor": "STM32F303", + "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu", "indicators": { "caps_lock": "B2", "num_lock": "C15", diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json index 556c8bf7e5..b83a4828e3 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -3,6 +3,9 @@ "usb": { "pid": "0xAEC2" }, + "processor": "STM32F303", + "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu", "indicators": { "caps_lock": "B2", "num_lock": "C15", diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json index d49fd7970a..89bf9abe9b 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -3,6 +3,8 @@ "usb": { "pid": "0xAEC3" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "indicators": { "caps_lock": "C14", "num_lock": "A0", diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk index 3407a7b780..7127485d00 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/adelais/rules.mk b/keyboards/mechlovin/adelais/rules.mk index 995e851ae2..264ea93322 100644 --- a/keyboards/mechlovin/adelais/rules.mk +++ b/keyboards/mechlovin/adelais/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json index ce04dbb068..a6efa3810a 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json @@ -1,5 +1,8 @@ { "usb": { "pid": "0xAD01" - } + }, + "processor": "STM32F303", + "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu" } diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json index f3b66e9eb2..a8d21313a2 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json @@ -1,5 +1,8 @@ { "usb": { "pid": "0xAD02" - } + }, + "processor": "STM32F303", + "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu" } diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json new file mode 100644 index 0000000000..cf993be247 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json @@ -0,0 +1,4 @@ +{ + "processor": "STM32F103", + "bootloader": "stm32duino" +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk index 34cbe43495..e69de29bb2 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk @@ -1,5 +0,0 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk index 5af1ba8536..257dd3bf57 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk @@ -1 +1,3 @@ ENCODER_ENABLE = yes + +DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json new file mode 100644 index 0000000000..774c3dcf31 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json @@ -0,0 +1,5 @@ +{ + "processor": "STM32F303", + "board": "QMK_PROTON_C", + "bootloader": "stm32-dfu" +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk index 7a846816d1..e69de29bb2 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk @@ -1,6 +0,0 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json index 0103bf09b6..f571ebab51 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json @@ -3,6 +3,8 @@ "usb": { "pid": "0xAD04" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "indicators": { "caps_lock": "E6", "num_lock": "D7", diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk index 0bba0b6eaf..c807f2ad09 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality diff --git a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk index 496312fe98..8c22db19ee 100644 --- a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk +++ b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - WS2812_DRIVER = pwm SERIAL_DRIVER = usart AUDIO_ENABLE = no diff --git a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk index 496312fe98..8c22db19ee 100644 --- a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk +++ b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - WS2812_DRIVER = pwm SERIAL_DRIVER = usart AUDIO_ENABLE = no diff --git a/keyboards/ymdk/ymd40/air40/info.json b/keyboards/ymdk/ymd40/air40/info.json index 38cc6970ca..3920ff6a29 100644 --- a/keyboards/ymdk/ymd40/air40/info.json +++ b/keyboards/ymdk/ymd40/air40/info.json @@ -8,6 +8,8 @@ "pid": "0x0911", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/ymdk/ymd40/air40/rules.mk b/keyboards/ymdk/ymd40/air40/rules.mk index 3325a699df..3adfcf796b 100644 --- a/keyboards/ymdk/ymd40/air40/rules.mk +++ b/keyboards/ymdk/ymd40/air40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -23,4 +17,3 @@ AUDIO_SUPPORTED = no KEY_LOCK_ENABLE = no LAYOUTS = ortho_4x12 - |