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

2024-12-05 01:15:19 +00:00 · 2024-04-23 02:59:36 +00:00 · 2024-04-23 02:59:36 +00:00 · a8bea90c71
commit a8bea90c71
parent cbe2cfea8f e69b638756
67 changed files with 11 additions and 13 deletions
--- a/keyboards/jacky_studio/piggy60/rev2/keyboard.json
+++ b/keyboards/jacky_studio/piggy60/rev2/keyboard.json
--- a/keyboards/janus/keyboard.json
+++ b/keyboards/janus/keyboard.json
--- a/keyboards/jaykeeb/joker/keyboard.json
+++ b/keyboards/jaykeeb/joker/keyboard.json
--- a/keyboards/jaykeeb/joker/rules.mk
+++ b/keyboards/jaykeeb/joker/rules.mk
@ -1 +0,0 @@
-# This file intentionally left blank
--- a/keyboards/jaykeeb/kamigakushi/keyboard.json
+++ b/keyboards/jaykeeb/kamigakushi/keyboard.json
--- a/keyboards/jones/v03/keyboard.json
+++ b/keyboards/jones/v03/keyboard.json
--- a/keyboards/jones/v03_1/keyboard.json
+++ b/keyboards/jones/v03_1/keyboard.json
--- a/keyboards/joshajohnson/hub16/keyboard.json
+++ b/keyboards/joshajohnson/hub16/keyboard.json
--- a/keyboards/jpe230/big_knob/keyboard.json
+++ b/keyboards/jpe230/big_knob/keyboard.json
--- a/keyboards/kagizaraya/chidori/keyboard.json
+++ b/keyboards/kagizaraya/chidori/keyboard.json
--- a/keyboards/kagizaraya/scythe/keyboard.json
+++ b/keyboards/kagizaraya/scythe/keyboard.json
--- a/keyboards/kakunpc/choc_taro/keyboard.json
+++ b/keyboards/kakunpc/choc_taro/keyboard.json
--- a/keyboards/kakunpc/thedogkeyboard/keyboard.json
+++ b/keyboards/kakunpc/thedogkeyboard/keyboard.json
--- a/keyboards/kaly/kaly42/keyboard.json
+++ b/keyboards/kaly/kaly42/keyboard.json
--- a/keyboards/karn/keyboard.json
+++ b/keyboards/karn/keyboard.json
--- a/keyboards/kb_elmo/aek2_usb/keyboard.json
+++ b/keyboards/kb_elmo/aek2_usb/keyboard.json
--- a/keyboards/kb_elmo/elmopad/keyboard.json
+++ b/keyboards/kb_elmo/elmopad/keyboard.json
--- a/keyboards/kb_elmo/isolation/keyboard.json
+++ b/keyboards/kb_elmo/isolation/keyboard.json
--- a/keyboards/kb_elmo/m0110a_usb/keyboard.json
+++ b/keyboards/kb_elmo/m0110a_usb/keyboard.json
--- a/keyboards/kb_elmo/m0116_usb/keyboard.json
+++ b/keyboards/kb_elmo/m0116_usb/keyboard.json
--- a/keyboards/kb_elmo/sesame/keyboard.json
+++ b/keyboards/kb_elmo/sesame/keyboard.json
--- a/keyboards/kb_elmo/twelvekey/keyboard.json
+++ b/keyboards/kb_elmo/twelvekey/keyboard.json
--- a/keyboards/kbdfans/jm60/keyboard.json
+++ b/keyboards/kbdfans/jm60/keyboard.json
@ -19,6 +19,8 @@
        "extrakey": true,
        "nkro": true
    },
+    "bootloader": "custom",
+    "processor": "STM32F103",
    "community_layouts": ["60_ansi"],
    "layouts": {
        "LAYOUT_60_ansi": {
--- a/keyboards/kbdfans/jm60/rules.mk
+++ b/keyboards/kbdfans/jm60/rules.mk
@ -1,8 +1,3 @@
-# MCU name
-MCU = STM32F103
-
+# custom bootloader
 MCU_LDSCRIPT = jm60_bootloader
 BOARD = ST_NUCLEO64_F103RB
-
-# Bootloader selection
-BOOTLOADER = custom
--- a/keyboards/kbdfans/kbd4x/keyboard.json
+++ b/keyboards/kbdfans/kbd4x/keyboard.json
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
--- a/keyboards/kbdfans/niu_mini/keyboard.json
+++ b/keyboards/kbdfans/niu_mini/keyboard.json
--- a/keyboards/kbdfans/odin75/keyboard.json
+++ b/keyboards/kbdfans/odin75/keyboard.json
--- a/keyboards/kbdmania/kmac/keyboard.json
+++ b/keyboards/kbdmania/kmac/keyboard.json
--- a/keyboards/kbdmania/kmac_pad/keyboard.json
+++ b/keyboards/kbdmania/kmac_pad/keyboard.json
--- a/keyboards/kbnordic/nordic65/rev_a/keyboard.json
+++ b/keyboards/kbnordic/nordic65/rev_a/keyboard.json
--- a/keyboards/keebio/cepstrum/rev1/keyboard.json
+++ b/keyboards/keebio/cepstrum/rev1/keyboard.json
--- a/keyboards/keebio/foldkb/rev1/keyboard.json
+++ b/keyboards/keebio/foldkb/rev1/keyboard.json
--- a/keyboards/keebio/foldkb/rev1/rules.mk
+++ b/keyboards/keebio/foldkb/rev1/rules.mk
--- a/keyboards/keebio/iris/rev8/keyboard.json
+++ b/keyboards/keebio/iris/rev8/keyboard.json
--- a/keyboards/keebio/iris_ce/rev1/keyboard.json
+++ b/keyboards/keebio/iris_ce/rev1/keyboard.json
--- a/keyboards/keebio/levinson/rev3/keyboard.json
+++ b/keyboards/keebio/levinson/rev3/keyboard.json
--- a/keyboards/keebio/nyquist/rev4/keyboard.json
+++ b/keyboards/keebio/nyquist/rev4/keyboard.json
--- a/keyboards/keebio/sinc/rev3/keyboard.json
+++ b/keyboards/keebio/sinc/rev3/keyboard.json
--- a/keyboards/keebio/sinc/rev4/keyboard.json
+++ b/keyboards/keebio/sinc/rev4/keyboard.json
--- a/keyboards/keebio/wavelet/keyboard.json
+++ b/keyboards/keebio/wavelet/keyboard.json
--- a/keyboards/keebwerk/mega/ansi/keyboard.json
+++ b/keyboards/keebwerk/mega/ansi/keyboard.json
--- a/keyboards/keebwerk/nano_slider/keyboard.json
+++ b/keyboards/keebwerk/nano_slider/keyboard.json
--- a/keyboards/keyboardio/model01/keyboard.json
+++ b/keyboards/keyboardio/model01/keyboard.json
--- a/keyboards/keycapsss/3w6_2040/keyboard.json
+++ b/keyboards/keycapsss/3w6_2040/keyboard.json
--- a/keyboards/keycult/keycult65/keyboard.json
+++ b/keyboards/keycult/keycult65/keyboard.json
--- a/keyboards/keygem/kg60ansi/keyboard.json
+++ b/keyboards/keygem/kg60ansi/keyboard.json
--- a/keyboards/keygem/kg65rgbv2/keyboard.json
+++ b/keyboards/keygem/kg65rgbv2/keyboard.json
--- a/keyboards/keyhive/honeycomb/keyboard.json
+++ b/keyboards/keyhive/honeycomb/keyboard.json
--- a/keyboards/keyhive/lattice60/keyboard.json
+++ b/keyboards/keyhive/lattice60/keyboard.json
--- a/keyboards/kin80/blackpill401/keyboard.json
+++ b/keyboards/kin80/blackpill401/keyboard.json
@ -1,6 +1,9 @@
 {
    "usb": {
-        "device_version": "0.0.3"
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
--- a/keyboards/kin80/blackpill401/rules.mk
+++ b/keyboards/kin80/blackpill401/rules.mk
@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
--- a/keyboards/kin80/blackpill411/keyboard.json
+++ b/keyboards/kin80/blackpill411/keyboard.json
@ -1,6 +1,9 @@
 {
    "usb": {
-        "device_version": "0.0.3"
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
    },
    "matrix_pins": {
        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
--- a/keyboards/kin80/blackpill411/rules.mk
+++ b/keyboards/kin80/blackpill411/rules.mk
@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
--- a/keyboards/kinesis/alvicstep/keyboard.json
+++ b/keyboards/kinesis/alvicstep/keyboard.json
--- a/keyboards/kinesis/kint41/keyboard.json
+++ b/keyboards/kinesis/kint41/keyboard.json
--- a/keyboards/kinesis/kintlc/keyboard.json
+++ b/keyboards/kinesis/kintlc/keyboard.json
--- a/keyboards/kinesis/nguyenvietyen/keyboard.json
+++ b/keyboards/kinesis/nguyenvietyen/keyboard.json
--- a/keyboards/kmini/keyboard.json
+++ b/keyboards/kmini/keyboard.json
--- a/keyboards/kopibeng/mnk65_stm32/keyboard.json
+++ b/keyboards/kopibeng/mnk65_stm32/keyboard.json
--- a/keyboards/kopibeng/xt87/keyboard.json
+++ b/keyboards/kopibeng/xt87/keyboard.json
--- a/keyboards/kopibeng/xt87/rules.mk
+++ b/keyboards/kopibeng/xt87/rules.mk
@ -1,2 +0,0 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
--- a/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
--- a/keyboards/ktec/ergodone/keyboard.json
+++ b/keyboards/ktec/ergodone/keyboard.json