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

2025-03-12 22:44:11 +00:00 · 2024-04-16 01:16:37 +00:00 · 2024-04-16 01:16:37 +00:00 · a27768684b
commit a27768684b
parent e4487714eb abe4d9cdca
76 changed files with 7 additions and 5 deletions
--- a/keyboards/cablecardesigns/phoenix/keyboard.json
+++ b/keyboards/cablecardesigns/phoenix/keyboard.json
--- a/keyboards/cannonkeys/aella/keyboard.json
+++ b/keyboards/cannonkeys/aella/keyboard.json
--- a/keyboards/cannonkeys/an_c/keyboard.json
+++ b/keyboards/cannonkeys/an_c/keyboard.json
--- a/keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json
+++ b/keyboards/cannonkeys/bakeneko60_iso_hs/keyboard.json
--- a/keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json
+++ b/keyboards/cannonkeys/bakeneko65_iso_hs/keyboard.json
--- a/keyboards/cannonkeys/balance/keyboard.json
+++ b/keyboards/cannonkeys/balance/keyboard.json
--- a/keyboards/cannonkeys/brutalv2_65/keyboard.json
+++ b/keyboards/cannonkeys/brutalv2_65/keyboard.json
--- a/keyboards/cannonkeys/chimera65_hs/keyboard.json
+++ b/keyboards/cannonkeys/chimera65_hs/keyboard.json
--- a/keyboards/cannonkeys/cloudline/keyboard.json
+++ b/keyboards/cannonkeys/cloudline/keyboard.json
--- a/keyboards/cannonkeys/crin/keyboard.json
+++ b/keyboards/cannonkeys/crin/keyboard.json
--- a/keyboards/cannonkeys/devastatingtkl/keyboard.json
+++ b/keyboards/cannonkeys/devastatingtkl/keyboard.json
--- a/keyboards/cannonkeys/ellipse/keyboard.json
+++ b/keyboards/cannonkeys/ellipse/keyboard.json
--- a/keyboards/cannonkeys/ellipse_hs/keyboard.json
+++ b/keyboards/cannonkeys/ellipse_hs/keyboard.json
--- a/keyboards/cannonkeys/gentoo/keyboard.json
+++ b/keyboards/cannonkeys/gentoo/keyboard.json
--- a/keyboards/cannonkeys/gentoo_hs/keyboard.json
+++ b/keyboards/cannonkeys/gentoo_hs/keyboard.json
--- a/keyboards/cannonkeys/instant60/keyboard.json
+++ b/keyboards/cannonkeys/instant60/keyboard.json
--- a/keyboards/cannonkeys/instant65/keyboard.json
+++ b/keyboards/cannonkeys/instant65/keyboard.json
--- a/keyboards/cannonkeys/is0gr/keyboard.json
+++ b/keyboards/cannonkeys/is0gr/keyboard.json
--- a/keyboards/cannonkeys/leviatan/keyboard.json
+++ b/keyboards/cannonkeys/leviatan/keyboard.json
--- a/keyboards/cannonkeys/malicious_ergo/keyboard.json
+++ b/keyboards/cannonkeys/malicious_ergo/keyboard.json
--- a/keyboards/cannonkeys/meetuppad2023/keyboard.json
+++ b/keyboards/cannonkeys/meetuppad2023/keyboard.json
--- a/keyboards/cannonkeys/moment/keyboard.json
+++ b/keyboards/cannonkeys/moment/keyboard.json
--- a/keyboards/cannonkeys/moment_hs/keyboard.json
+++ b/keyboards/cannonkeys/moment_hs/keyboard.json
--- a/keyboards/cannonkeys/obliterated75/keyboard.json
+++ b/keyboards/cannonkeys/obliterated75/keyboard.json
--- a/keyboards/cannonkeys/onyx/keyboard.json
+++ b/keyboards/cannonkeys/onyx/keyboard.json
--- a/keyboards/cannonkeys/rekt1800/keyboard.json
+++ b/keyboards/cannonkeys/rekt1800/keyboard.json
--- a/keyboards/cannonkeys/ripple/keyboard.json
+++ b/keyboards/cannonkeys/ripple/keyboard.json
--- a/keyboards/cannonkeys/ripple_hs/keyboard.json
+++ b/keyboards/cannonkeys/ripple_hs/keyboard.json
--- a/keyboards/cannonkeys/sagittarius/keyboard.json
+++ b/keyboards/cannonkeys/sagittarius/keyboard.json
--- a/keyboards/cannonkeys/satisfaction75_hs/keyboard.json
+++ b/keyboards/cannonkeys/satisfaction75_hs/keyboard.json
--- a/keyboards/cannonkeys/savage65/keyboard.json
+++ b/keyboards/cannonkeys/savage65/keyboard.json
--- a/keyboards/cannonkeys/serenity/keyboard.json
+++ b/keyboards/cannonkeys/serenity/keyboard.json
--- a/keyboards/cannonkeys/tmov2/keyboard.json
+++ b/keyboards/cannonkeys/tmov2/keyboard.json
--- a/keyboards/cannonkeys/tsukuyomi/keyboard.json
+++ b/keyboards/cannonkeys/tsukuyomi/keyboard.json
--- a/keyboards/cannonkeys/vector/keyboard.json
+++ b/keyboards/cannonkeys/vector/keyboard.json
--- a/keyboards/cannonkeys/vicious40/keyboard.json
+++ b/keyboards/cannonkeys/vicious40/keyboard.json
--- a/keyboards/cantor/keyboard.json
+++ b/keyboards/cantor/keyboard.json
--- a/keyboards/centromere/keyboard.json
+++ b/keyboards/centromere/keyboard.json
--- a/keyboards/checkerboards/phoenix45_ortho/keyboard.json
+++ b/keyboards/checkerboards/phoenix45_ortho/keyboard.json
--- a/keyboards/checkerboards/quark/keyboard.json
+++ b/keyboards/checkerboards/quark/keyboard.json
--- a/keyboards/checkerboards/quark_squared/keyboard.json
+++ b/keyboards/checkerboards/quark_squared/keyboard.json
--- a/keyboards/cipulot/ec_23u/keyboard.json
+++ b/keyboards/cipulot/ec_23u/keyboard.json
--- a/keyboards/cipulot/ec_60/keyboard.json
+++ b/keyboards/cipulot/ec_60/keyboard.json
--- a/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json
+++ b/keyboards/cipulot/ec_alveus/1_0_0/keyboard.json
--- a/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json
+++ b/keyboards/cipulot/ec_alveus/1_2_0/keyboard.json
--- a/keyboards/cipulot/ec_pro2/keyboard.json
+++ b/keyboards/cipulot/ec_pro2/keyboard.json
--- a/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
+++ b/keyboards/cipulot/ec_prox/ansi_iso/keyboard.json
--- a/keyboards/cipulot/ec_prox/jis/keyboard.json
+++ b/keyboards/cipulot/ec_prox/jis/keyboard.json
--- a/keyboards/cipulot/ec_theca/keyboard.json
+++ b/keyboards/cipulot/ec_theca/keyboard.json
--- a/keyboards/cipulot/ec_typek/keyboard.json
+++ b/keyboards/cipulot/ec_typek/keyboard.json
--- a/keyboards/cipulot/mnk_60_ec/keyboard.json
+++ b/keyboards/cipulot/mnk_60_ec/keyboard.json
--- a/keyboards/cipulot/mnk_65_ec/keyboard.json
+++ b/keyboards/cipulot/mnk_65_ec/keyboard.json
--- a/keyboards/cipulot/rf_r1_8_9xu/keyboard.json
+++ b/keyboards/cipulot/rf_r1_8_9xu/keyboard.json
--- a/keyboards/clueboard/2x1800/2021/keyboard.json
+++ b/keyboards/clueboard/2x1800/2021/keyboard.json
--- a/keyboards/clueboard/60/keyboard.json
+++ b/keyboards/clueboard/60/keyboard.json
--- a/keyboards/controllerworks/city42/keyboard.json
+++ b/keyboards/controllerworks/city42/keyboard.json
--- a/keyboards/controllerworks/mini36/keyboard.json
+++ b/keyboards/controllerworks/mini36/keyboard.json
--- a/keyboards/controllerworks/mini42/keyboard.json
+++ b/keyboards/controllerworks/mini42/keyboard.json
--- a/keyboards/converter/hp_46010a/keyboard.json
+++ b/keyboards/converter/hp_46010a/keyboard.json
--- a/keyboards/converter/ibm_terminal/keyboard.json
+++ b/keyboards/converter/ibm_terminal/keyboard.json
--- a/keyboards/converter/m0110_usb/keyboard.json
+++ b/keyboards/converter/m0110_usb/keyboard.json
--- a/keyboards/converter/siemens_tastatur/keyboard.json
+++ b/keyboards/converter/siemens_tastatur/keyboard.json
--- a/keyboards/converter/usb_usb/ble/keyboard.json
+++ b/keyboards/converter/usb_usb/ble/keyboard.json
@ -2,5 +2,11 @@
    "bootloader": "caterina",
    "bluetooth": {
        "driver": "bluefruit_le"
+    },
+    "build": {
+        "lto": true
+    },
+    "features":{
+        "bluetooth": true
    }
 }
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@ -1,6 +1,2 @@
 # Processor frequency
 F_CPU = 8000000
-
-EXTRAKEY_ENABLE = no
-BLUETOOTH_ENABLE = yes
-LTO_ENABLE = yes
--- a/keyboards/converter/usb_usb/pro_micro/keyboard.json
+++ b/keyboards/converter/usb_usb/pro_micro/keyboard.json
--- a/keyboards/converter/xmk/keyboard.json
+++ b/keyboards/converter/xmk/keyboard.json
--- a/keyboards/converter/xt_usb/keyboard.json
+++ b/keyboards/converter/xt_usb/keyboard.json
--- a/keyboards/coseyfannitutti/discipline/keyboard.json
+++ b/keyboards/coseyfannitutti/discipline/keyboard.json
--- a/keyboards/coseyfannitutti/mysterium/keyboard.json
+++ b/keyboards/coseyfannitutti/mysterium/keyboard.json
--- a/keyboards/cozykeys/speedo/v3/keyboard.json
+++ b/keyboards/cozykeys/speedo/v3/keyboard.json
@ -36,6 +36,7 @@
  "diode_direction": "COL2ROW",
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
+  "pin_compatible": "elite_c",
  "features": {
    "bootmagic": false,
    "mousekey": true,
--- a/keyboards/cozykeys/speedo/v3/rules.mk
+++ b/keyboards/cozykeys/speedo/v3/rules.mk
@ -1 +0,0 @@
-PIN_COMPATIBLE = elite_c
--- a/keyboards/crimsonkeyboards/resume1800/keyboard.json
+++ b/keyboards/crimsonkeyboards/resume1800/keyboard.json
--- a/keyboards/crypt_macro/keyboard.json
+++ b/keyboards/crypt_macro/keyboard.json
--- a/keyboards/custommk/cmk11/keyboard.json
+++ b/keyboards/custommk/cmk11/keyboard.json
--- a/keyboards/custommk/ergostrafer/keyboard.json
+++ b/keyboards/custommk/ergostrafer/keyboard.json
--- a/keyboards/custommk/evo70_r2/keyboard.json
+++ b/keyboards/custommk/evo70_r2/keyboard.json