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

2024-04-23 09:48:00 +00:00 · 2024-04-23 09:48:00 +00:00 · 5fec1395d1
commit 5fec1395d1
parent 14fab94b22 32136afe24
58 changed files with 64 additions and 160 deletions
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/info.json
@ -24,7 +24,5 @@
        "rows": ["A2", "B8", "A8", "B9"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/info.json
@ -24,7 +24,5 @@
        "rows": ["A2", "B8", "A8", "B9"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/info.json
@ -24,7 +24,5 @@
        "rows": ["B15", "A2", "B8", "A8", "B9"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
--- a/keyboards/bastardkb/scylla/blackpill/info.json
+++ b/keyboards/bastardkb/scylla/blackpill/info.json
@ -24,7 +24,5 @@
        "rows": ["B15", "A2", "B8", "A8", "B9"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
--- a/keyboards/bastardkb/skeletyl/blackpill/info.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/info.json
@ -24,7 +24,5 @@
        "rows": ["A2", "B8", "A8", "B9"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
--- a/keyboards/bastardkb/tbkmini/blackpill/info.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/info.json
@ -24,7 +24,5 @@
        "rows": ["A2", "B8", "A8", "B9"]
    },
    "diode_direction": "ROW2COL",
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
-    "board": "BLACKPILL_STM32_F411"
+    "development_board": "blackpill_f411"
 }
--- a/keyboards/bt66tech/bt66tech60/keyboard.json
+++ b/keyboards/bt66tech/bt66tech60/keyboard.json
@ -55,8 +55,7 @@
        "pin": "B15",
        "driver": "spi"
    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
    "community_layouts": ["60_ansi"],
    "layouts": {
        "LAYOUT_60_ansi": {
--- a/keyboards/cannonkeys/ortho48/keyboard.json
+++ b/keyboards/cannonkeys/ortho48/keyboard.json
@ -48,8 +48,7 @@
    "pin": "B15",
    "driver": "spi"
  },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
  "community_layouts": ["ortho_4x12"],
  "layouts": {
    "LAYOUT_ortho_4x12": {
--- a/keyboards/cannonkeys/ortho60/keyboard.json
+++ b/keyboards/cannonkeys/ortho60/keyboard.json
@ -48,8 +48,7 @@
    "pin": "B15",
    "driver": "spi"
  },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
  "community_layouts": ["ortho_5x12"],
  "layouts": {
    "LAYOUT_ortho_5x12": {
--- a/keyboards/cannonkeys/ortho75/keyboard.json
+++ b/keyboards/cannonkeys/ortho75/keyboard.json
@ -54,8 +54,7 @@
    "pin": "B15",
    "driver": "spi"
  },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
  "community_layouts": ["ortho_5x15"],
  "layouts": {
    "LAYOUT_ortho_5x15": {
--- a/keyboards/cannonkeys/practice60/keyboard.json
+++ b/keyboards/cannonkeys/practice60/keyboard.json
@ -48,8 +48,7 @@
    "pin": "B15",
    "driver": "spi"
  },
-  "processor": "STM32F103",
-  "bootloader": "stm32duino",
+  "development_board": "bluepill",
  "community_layouts": ["60_ansi"],
  "layouts": {
    "LAYOUT_60_ansi": {
--- a/keyboards/cannonkeys/practice65/keyboard.json
+++ b/keyboards/cannonkeys/practice65/keyboard.json
@ -48,9 +48,8 @@
        "pin": "B15",
        "driver": "spi"
    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
-   "layouts": {
+    "development_board": "bluepill",
+    "layouts": {
        "LAYOUT_default": {
            "layout": [
                {"matrix": [0, 0], "x": 0, "y": 0},
--- a/keyboards/cantor/keyboard.json
+++ b/keyboards/cantor/keyboard.json
@ -2,7 +2,6 @@
    "manufacturer": "Diego Palacios",
    "keyboard_name": "cantor",
    "maintainer": "diepala",
-    "bootloader": "stm32-dfu",
    "features": {
        "bootmagic": true,
        "command": false,
@ -11,8 +10,7 @@
        "mousekey": true,
        "nkro": true
    },
-    "processor": "STM32F401",
-    "board": "BLACKPILL_STM32_F401",
+    "development_board": "blackpill_f401",
    "url": "https://github.com/diepala/cantor",
    "usb": {
        "device_version": "1.0.0",
--- a/keyboards/ckeys/thedora/keyboard.json
+++ b/keyboards/ckeys/thedora/keyboard.json
@ -29,9 +29,7 @@
      {"pin_a": "B13", "pin_b": "B15"}
    ]
  },
-  "processor": "STM32F303",
-  "bootloader": "stm32-dfu",
-  "board": "QMK_PROTON_C",
+  "development_board": "proton_c",
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/converter/siemens_tastatur/keyboard.json
+++ b/keyboards/converter/siemens_tastatur/keyboard.json
@ -8,8 +8,7 @@
        "pid": "0x4353",
        "device_version": "0.0.1"
    },
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
    "features": {
        "bootmagic": false,
        "mousekey": true,
--- a/keyboards/ez_maker/directpins/proton_c/keyboard.json
+++ b/keyboards/ez_maker/directpins/proton_c/keyboard.json
@ -2,9 +2,7 @@
    "manufacturer": "Zach White",
    "keyboard_name": "DirectPins Proton C",
    "maintainer": "skullydazed",
-    "processor": "STM32F303",
-    "board": "QMK_PROTON_C",
-    "bootloader": "stm32-dfu",
+    "development_board": "proton_c",
    "features": {
        "bootmagic": true,
        "extrakey": true,
--- a/keyboards/handwired/d48/keyboard.json
+++ b/keyboards/handwired/d48/keyboard.json
@ -42,8 +42,7 @@
    "qmk": {
        "tap_keycode_delay": 10
    },
-    "processor": "STM32F303",
-    "bootloader": "stm32-dfu",
+    "development_board": "proton_c",
    "features": {
        "bootmagic": false,
        "mousekey": false,
@ -56,7 +55,6 @@
        "oled": true,
        "unicode": true
    },
-    "board": "QMK_PROTON_C",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
@ -10,14 +10,12 @@
            "matrix": [7, 0]
        }
    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f411",
    "features": {
        "bootmagic": true,
        "mousekey": true,
        "extrakey": true,
        "console": true,
        "command": true
-    },
-    "board": "BLACKPILL_STM32_F411"
+    }
 }
--- a/keyboards/handwired/dygma/raise/info.json
+++ b/keyboards/handwired/dygma/raise/info.json
@ -24,14 +24,12 @@
        "led_flush_limit": 100,
        "sleep": true
    },
-    "processor": "STM32F411",
-    "bootloader": "stm32-dfu",
+    "development_board": "blackpill_f411",
    "features": {
        "bootmagic": false,
        "mousekey": true,
        "extrakey": true,
        "rgb_matrix": true
    },
-    "board": "BLACKPILL_STM32_F411",
    "debounce": 0
 }
--- a/keyboards/handwired/ergocheap/keyboard.json
+++ b/keyboards/handwired/ergocheap/keyboard.json
@ -25,8 +25,7 @@
        "rows": ["B5", "B6", "B7", "B9", "B8"]
    },
    "diode_direction": "COL2ROW",
-    "processor": "STM32F103",
-    "bootloader": "stm32duino",
+    "development_board": "bluepill",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/Show more
+++ b/Show more