Merge remote-tracking branch 'origin/develop' into xap

2022-07-01 14:40:10 +00:00 · 2022-07-01 14:40:10 +00:00 · c01e62a7f0
commit c01e62a7f0
parent 0237e99669 a61e549a31
30 changed files with 30 additions and 0 deletions
--- a/keyboards/cantor/info.json
+++ b/keyboards/cantor/info.json
@ -12,6 +12,7 @@
        "nkro": true
    },
    "processor": "STM32F401",
+    "board": "BLACKPILL_STM32_F411",
    "url": "https://github.com/diepala/cantor",
    "usb": {
        "device_version": "1.0.0",
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/macroboard/f401/rules.mk
+++ b/keyboards/handwired/macroboard/f401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/macroboard/f411/rules.mk
+++ b/keyboards/handwired/macroboard/f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/onekey/blackpill_f401/rules.mk
+++ b/keyboards/handwired/onekey/blackpill_f401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/onekey/blackpill_f411/rules.mk
+++ b/keyboards/handwired/onekey/blackpill_f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/pill60/blackpill_f401/rules.mk
+++ b/keyboards/handwired/pill60/blackpill_f401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/pill60/blackpill_f411/rules.mk
+++ b/keyboards/handwired/pill60/blackpill_f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/riblee_f401/rules.mk
+++ b/keyboards/handwired/riblee_f401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/riblee_f411/rules.mk
+++ b/keyboards/handwired/riblee_f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/handwired/uthol/rev3/rules.mk
+++ b/keyboards/handwired/uthol/rev3/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/kin80/blackpill401/rules.mk
+++ b/keyboards/kin80/blackpill401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/kin80/blackpill411/rules.mk
+++ b/keyboards/kin80/blackpill411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/obe/f401/eeprom/rules.mk
+++ b/keyboards/mechwild/obe/f401/eeprom/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/obe/f401/rules.mk
+++ b/keyboards/mechwild/obe/f401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/obe/f411/eeprom/rules.mk
+++ b/keyboards/mechwild/obe/f411/eeprom/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/obe/f411/rules.mk
+++ b/keyboards/mechwild/obe/f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/waka60/f401/eeprom/rules.mk
+++ b/keyboards/mechwild/waka60/f401/eeprom/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/waka60/f401/rules.mk
+++ b/keyboards/mechwild/waka60/f401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/waka60/f411/eeprom/rules.mk
+++ b/keyboards/mechwild/waka60/f411/eeprom/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mechwild/waka60/f411/rules.mk
+++ b/keyboards/mechwild/waka60/f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/mlego/m60_split/rev2/rules.mk
+++ b/keyboards/mlego/m60_split/rev2/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/tkw/grandiceps/rules.mk
+++ b/keyboards/tkw/grandiceps/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/tkw/stoutgat/v2/f411/rules.mk
+++ b/keyboards/tkw/stoutgat/v2/f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk
+++ b/keyboards/tronguylabs/m122_3270/blackpill/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/yanghu/unicorne/f411/rules.mk
+++ b/keyboards/yanghu/unicorne/f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/zvecr/zv48/f401/rules.mk
+++ b/keyboards/zvecr/zv48/f401/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F401
+BOARD = BLACKPILL_STM32_F401

 # Bootloader selection
 BOOTLOADER = stm32-dfu
--- a/keyboards/zvecr/zv48/f411/rules.mk
+++ b/keyboards/zvecr/zv48/f411/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F411
+BOARD = BLACKPILL_STM32_F411

 # Bootloader selection
 BOOTLOADER = stm32-dfu