From e869c80af74a91d28e51628da495e66da0cbc3ce Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 17 Apr 2024 02:49:17 +0100 Subject: [PATCH] Migrate build target markers to keyboard.json - HI (#23540) --- .../hadron/ver3/{info.json => keyboard.json} | 0 .../halfcliff/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../handwired/42/{info.json => keyboard.json} | 0 .../aball/{info.json => keyboard.json} | 0 .../alcor_dactyl/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../bdn9_ble/{info.json => keyboard.json} | 0 .../cyberstar/{info.json => keyboard.json} | 0 .../d48/{info.json => keyboard.json} | 0 .../dactyl/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../datahand/{info.json => keyboard.json} | 0 .../dqz11n1g/{info.json => keyboard.json} | 0 .../frenchdev/{info.json => keyboard.json} | 0 .../fruity60/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../lagrange/{info.json => keyboard.json} | 0 .../5x5_macropad/{info.json => keyboard.json} | 0 .../f411/{info.json => keyboard.json} | 0 .../meck_tkl/blackpill_f401/info.json | 14 ----- .../keyboard.json} | 23 ++++++++- .../meck_tkl/blackpill_f401/rules.mk | 4 -- keyboards/handwired/meck_tkl/config.h | 9 ---- .../{info.json => keyboard.json} | 5 ++ .../handwired/onekey/blackpill_f401/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../onekey/blackpill_f401_tinyuf2/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../handwired/onekey/blackpill_f411/rules.mk | 1 - .../{info.json => keyboard.json} | 5 ++ .../onekey/blackpill_f411_tinyuf2/rules.mk | 1 - .../{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../evb_wb32fq95/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../teensy_lc/{info.json => keyboard.json} | 0 .../ortho_brass/{info.json => keyboard.json} | 0 .../owlet60/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 5 ++ .../handwired/pill60/blackpill_f401/rules.mk | 4 -- .../{info.json => keyboard.json} | 5 ++ .../handwired/pill60/blackpill_f411/rules.mk | 4 -- .../feather/{info.json => keyboard.json} | 10 ++++ keyboards/handwired/prkl30/feather/rules.mk | 16 ------ .../promethium/{info.json => keyboard.json} | 0 .../pterodactyl/{info.json => keyboard.json} | 0 .../riblee_split/{info.json => keyboard.json} | 0 .../slash/{info.json => keyboard.json} | 0 .../stm32/{info.json => keyboard.json} | 0 .../trackpoint/{info.json => keyboard.json} | 0 .../4x6_right/{info.json => keyboard.json} | 0 .../f303/{info.json => keyboard.json} | 0 .../f411/{info.json => keyboard.json} | 0 .../twadlee/tp69/{info.json => keyboard.json} | 0 .../uthol/rev3/{info.json => keyboard.json} | 5 +- keyboards/handwired/uthol/rev3/rules.mk | 1 - .../wulkan/{info.json => keyboard.json} | 0 .../handwire/{info.json => keyboard.json} | 0 .../bad_wings/{info.json => keyboard.json} | 0 .../ansi/32u2/{info.json => keyboard.json} | 0 .../hhkb/jp/{info.json => keyboard.json} | 0 .../hhkb/yang/{info.json => keyboard.json} | 0 .../46/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/46/0_1/rules.mk | 5 -- .../48/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/48/0_1/rules.mk | 5 -- .../52/0_1/{info.json => keyboard.json} | 0 keyboards/hillside/52/0_1/rules.mk | 5 -- .../hbcp/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../lemon40/{info.json => keyboard.json} | 0 .../nyx/rev1/{info.json => keyboard.json} | 0 keyboards/hotdox/{info.json => keyboard.json} | 0 .../hs60/v1/{info.json => keyboard.json} | 0 .../hs60/v2/ansi/{info.json => keyboard.json} | 0 .../hs60/v2/hhkb/{info.json => keyboard.json} | 0 .../hs60/v2/iso/{info.json => keyboard.json} | 0 .../{info.json => keyboard.json} | 0 .../ingrained/{info.json => keyboard.json} | 0 .../inland/kb83/{info.json => keyboard.json} | 0 keyboards/inland/kb83/rgb_matrix_kb.inc | 51 ------------------- keyboards/inland/kb83/rules.mk | 1 - .../{info.json => keyboard.json} | 0 84 files changed, 66 insertions(+), 125 deletions(-) rename keyboards/hadron/ver3/{info.json => keyboard.json} (100%) rename keyboards/halfcliff/{info.json => keyboard.json} (100%) rename keyboards/handwired/108key_trackpoint/{info.json => keyboard.json} (100%) rename keyboards/handwired/42/{info.json => keyboard.json} (100%) rename keyboards/handwired/aball/{info.json => keyboard.json} (100%) rename keyboards/handwired/alcor_dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/battleship_gamepad/{info.json => keyboard.json} (100%) rename keyboards/handwired/bdn9_ble/{info.json => keyboard.json} (100%) rename keyboards/handwired/cyberstar/{info.json => keyboard.json} (100%) rename keyboards/handwired/d48/{info.json => keyboard.json} (100%) rename keyboards/handwired/dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/{info.json => keyboard.json} (100%) rename keyboards/handwired/datahand/{info.json => keyboard.json} (100%) rename keyboards/handwired/dqz11n1g/{info.json => keyboard.json} (100%) rename keyboards/handwired/frenchdev/{info.json => keyboard.json} (100%) rename keyboards/handwired/fruity60/{info.json => keyboard.json} (100%) rename keyboards/handwired/jankrp2040dactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/lagrange/{info.json => keyboard.json} (100%) rename keyboards/handwired/m40/5x5_macropad/{info.json => keyboard.json} (100%) rename keyboards/handwired/macroboard/f411/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/info.json rename keyboards/handwired/meck_tkl/{info.json => blackpill_f401/keyboard.json} (89%) delete mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/rules.mk delete mode 100644 keyboards/handwired/meck_tkl/config.h rename keyboards/handwired/onekey/blackpill_f401/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/handwired/onekey/blackpill_f401/rules.mk rename keyboards/handwired/onekey/blackpill_f401_tinyuf2/{info.json => keyboard.json} (80%) delete mode 100755 keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk rename keyboards/handwired/onekey/blackpill_f411/{info.json => keyboard.json} (79%) delete mode 100644 keyboards/handwired/onekey/blackpill_f411/rules.mk rename keyboards/handwired/onekey/blackpill_f411_tinyuf2/{info.json => keyboard.json} (80%) delete mode 100755 keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk rename keyboards/handwired/onekey/bluepill_f103c6/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/evb_wb32f3g71/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/evb_wb32fq95/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/sipeed_longan_nano/{info.json => keyboard.json} (100%) rename keyboards/handwired/onekey/teensy_lc/{info.json => keyboard.json} (100%) rename keyboards/handwired/ortho_brass/{info.json => keyboard.json} (100%) rename keyboards/handwired/owlet60/{info.json => keyboard.json} (100%) rename keyboards/handwired/pill60/blackpill_f401/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/handwired/pill60/blackpill_f401/rules.mk rename keyboards/handwired/pill60/blackpill_f411/{info.json => keyboard.json} (78%) delete mode 100644 keyboards/handwired/pill60/blackpill_f411/rules.mk rename keyboards/handwired/prkl30/feather/{info.json => keyboard.json} (78%) rename keyboards/handwired/promethium/{info.json => keyboard.json} (100%) rename keyboards/handwired/pterodactyl/{info.json => keyboard.json} (100%) rename keyboards/handwired/riblee_split/{info.json => keyboard.json} (100%) rename keyboards/handwired/slash/{info.json => keyboard.json} (100%) rename keyboards/handwired/split65/stm32/{info.json => keyboard.json} (100%) rename keyboards/handwired/trackpoint/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/4x6_right/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/5x6_right/f303/{info.json => keyboard.json} (100%) rename keyboards/handwired/tractyl_manuform/5x6_right/f411/{info.json => keyboard.json} (100%) rename keyboards/handwired/twadlee/tp69/{info.json => keyboard.json} (100%) rename keyboards/handwired/uthol/rev3/{info.json => keyboard.json} (92%) delete mode 100644 keyboards/handwired/uthol/rev3/rules.mk rename keyboards/handwired/wulkan/{info.json => keyboard.json} (100%) rename keyboards/hardwareabstraction/handwire/{info.json => keyboard.json} (100%) rename keyboards/hazel/bad_wings/{info.json => keyboard.json} (100%) rename keyboards/hhkb/ansi/32u2/{info.json => keyboard.json} (100%) rename keyboards/hhkb/jp/{info.json => keyboard.json} (100%) rename keyboards/hhkb/yang/{info.json => keyboard.json} (100%) rename keyboards/hillside/46/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/46/0_1/rules.mk rename keyboards/hillside/48/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/48/0_1/rules.mk rename keyboards/hillside/52/0_1/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/hillside/52/0_1/rules.mk rename keyboards/hineybush/hbcp/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/handwired_k552/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/lemon40/{info.json => keyboard.json} (100%) rename keyboards/horrortroll/nyx/rev1/{info.json => keyboard.json} (100%) rename keyboards/hotdox/{info.json => keyboard.json} (100%) rename keyboards/hs60/v1/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/ansi/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/hhkb/{info.json => keyboard.json} (100%) rename keyboards/hs60/v2/iso/{info.json => keyboard.json} (100%) rename keyboards/ibm/model_m_4th_gen/overnumpad_1xb/{info.json => keyboard.json} (100%) rename keyboards/ingrained/{info.json => keyboard.json} (100%) rename keyboards/inland/kb83/{info.json => keyboard.json} (100%) delete mode 100644 keyboards/inland/kb83/rgb_matrix_kb.inc delete mode 100644 keyboards/inland/kb83/rules.mk rename keyboards/input_club/ergodox_infinity/{info.json => keyboard.json} (100%) diff --git a/keyboards/hadron/ver3/info.json b/keyboards/hadron/ver3/keyboard.json similarity index 100% rename from keyboards/hadron/ver3/info.json rename to keyboards/hadron/ver3/keyboard.json diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/keyboard.json similarity index 100% rename from keyboards/halfcliff/info.json rename to keyboards/halfcliff/keyboard.json diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/keyboard.json similarity index 100% rename from keyboards/handwired/108key_trackpoint/info.json rename to keyboards/handwired/108key_trackpoint/keyboard.json diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/keyboard.json similarity index 100% rename from keyboards/handwired/42/info.json rename to keyboards/handwired/42/keyboard.json diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/keyboard.json similarity index 100% rename from keyboards/handwired/aball/info.json rename to keyboards/handwired/aball/keyboard.json diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/alcor_dactyl/info.json rename to keyboards/handwired/alcor_dactyl/keyboard.json diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/keyboard.json similarity index 100% rename from keyboards/handwired/battleship_gamepad/info.json rename to keyboards/handwired/battleship_gamepad/keyboard.json diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/keyboard.json similarity index 100% rename from keyboards/handwired/bdn9_ble/info.json rename to keyboards/handwired/bdn9_ble/keyboard.json diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/keyboard.json similarity index 100% rename from keyboards/handwired/cyberstar/info.json rename to keyboards/handwired/cyberstar/keyboard.json diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/keyboard.json similarity index 100% rename from keyboards/handwired/d48/info.json rename to keyboards/handwired/d48/keyboard.json diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl/info.json rename to keyboards/handwired/dactyl/keyboard.json diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json similarity index 100% rename from keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json rename to keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/keyboard.json similarity index 100% rename from keyboards/handwired/datahand/info.json rename to keyboards/handwired/datahand/keyboard.json diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/keyboard.json similarity index 100% rename from keyboards/handwired/dqz11n1g/info.json rename to keyboards/handwired/dqz11n1g/keyboard.json diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/keyboard.json similarity index 100% rename from keyboards/handwired/frenchdev/info.json rename to keyboards/handwired/frenchdev/keyboard.json diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/keyboard.json similarity index 100% rename from keyboards/handwired/fruity60/info.json rename to keyboards/handwired/fruity60/keyboard.json diff --git a/keyboards/handwired/jankrp2040dactyl/info.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json similarity index 100% rename from keyboards/handwired/jankrp2040dactyl/info.json rename to keyboards/handwired/jankrp2040dactyl/keyboard.json diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/keyboard.json similarity index 100% rename from keyboards/handwired/lagrange/info.json rename to keyboards/handwired/lagrange/keyboard.json diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/keyboard.json similarity index 100% rename from keyboards/handwired/m40/5x5_macropad/info.json rename to keyboards/handwired/m40/5x5_macropad/keyboard.json diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/keyboard.json similarity index 100% rename from keyboards/handwired/macroboard/f411/info.json rename to keyboards/handwired/macroboard/f411/keyboard.json diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json deleted file mode 100644 index eeaa9c392be..00000000000 --- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "matrix_pins": { - "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"], - "rows": ["B15", "A8", "A9", "B14", "A15", "B3"] - }, - "diode_direction": "COL2ROW", - "indicators": { - "caps_lock": "C13", - "on_state": 0 - }, - "processor": "STM32F401", - "bootloader": "stm32-dfu", - "board": "BLACKPILL_STM32_F401" -} diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json similarity index 89% rename from keyboards/handwired/meck_tkl/info.json rename to keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json index 5147d96ee02..4a9e2a5380a 100644 --- a/keyboards/handwired/meck_tkl/info.json +++ b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json @@ -6,7 +6,10 @@ "usb": { "vid": "0x474B", "pid": "0x0001", - "device_version": "0.0.1" + "device_version": "0.0.1", + "shared_endpoint": { + "keyboard": true + } }, "features": { "bootmagic": true, @@ -15,6 +18,24 @@ "console": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"], + "rows": ["B15", "A8", "A9", "B14", "A15", "B3"] + }, + "diode_direction": "COL2ROW", + "indicators": { + "caps_lock": "C13", + "on_state": 0 + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk deleted file mode 100644 index b5f27c93eab..00000000000 --- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h deleted file mode 100644 index 30221cc2168..00000000000 --- a/keyboards/handwired/meck_tkl/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Gabriel Kim (@gabrielkim13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/keyboard.json similarity index 79% rename from keyboards/handwired/onekey/blackpill_f401/info.json rename to keyboards/handwired/onekey/blackpill_f401/keyboard.json index 69a7ea87a75..29e2f3f17d6 100644 --- a/keyboards/handwired/onekey/blackpill_f401/info.json +++ b/keyboards/handwired/onekey/blackpill_f401/keyboard.json @@ -1,6 +1,11 @@ { "keyboard_name": "Onekey Blackpill STM32F401", "development_board": "blackpill_f401", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f401/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json similarity index 80% rename from keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json rename to keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json index ed9435c740b..413bf7a7f34 100644 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json @@ -2,6 +2,11 @@ "keyboard_name": "Onekey Blackpill STM32F401 TinyUF2", "development_board": "blackpill_f401", "bootloader": "tinyuf2", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk deleted file mode 100755 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/keyboard.json similarity index 79% rename from keyboards/handwired/onekey/blackpill_f411/info.json rename to keyboards/handwired/onekey/blackpill_f411/keyboard.json index 5ee8ec3d5ed..077fee4b3bd 100644 --- a/keyboards/handwired/onekey/blackpill_f411/info.json +++ b/keyboards/handwired/onekey/blackpill_f411/keyboard.json @@ -1,6 +1,11 @@ { "keyboard_name": "Onekey Blackpill STM32F411", "development_board": "blackpill_f411", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f411/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json similarity index 80% rename from keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json rename to keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json index 8e8b52080ad..e37bf6f54dc 100644 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json @@ -2,6 +2,11 @@ "keyboard_name": "Onekey Blackpill STM32F411 TinyUF2", "development_board": "blackpill_f411", "bootloader": "tinyuf2", + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["B0"], "rows": ["A7"] diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk deleted file mode 100755 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/bluepill_f103c6/info.json rename to keyboards/handwired/onekey/bluepill_f103c6/keyboard.json diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/evb_wb32f3g71/info.json rename to keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/evb_wb32fq95/info.json rename to keyboards/handwired/onekey/evb_wb32fq95/keyboard.json diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/sipeed_longan_nano/info.json rename to keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/keyboard.json similarity index 100% rename from keyboards/handwired/onekey/teensy_lc/info.json rename to keyboards/handwired/onekey/teensy_lc/keyboard.json diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/keyboard.json similarity index 100% rename from keyboards/handwired/ortho_brass/info.json rename to keyboards/handwired/ortho_brass/keyboard.json diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/keyboard.json similarity index 100% rename from keyboards/handwired/owlet60/info.json rename to keyboards/handwired/owlet60/keyboard.json diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json similarity index 78% rename from keyboards/handwired/pill60/blackpill_f401/info.json rename to keyboards/handwired/pill60/blackpill_f401/keyboard.json index 8d85a2e9300..9b3530b9583 100644 --- a/keyboards/handwired/pill60/blackpill_f401/info.json +++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], "rows": ["B4", "B3", "A15", "B13", "B5"] diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk deleted file mode 100644 index 3d2bfceea99..00000000000 --- a/keyboards/handwired/pill60/blackpill_f401/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json similarity index 78% rename from keyboards/handwired/pill60/blackpill_f411/info.json rename to keyboards/handwired/pill60/blackpill_f411/keyboard.json index 4e0935f79ce..1961d616ddb 100644 --- a/keyboards/handwired/pill60/blackpill_f411/info.json +++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json @@ -1,4 +1,9 @@ { + "usb": { + "shared_endpoint": { + "keyboard": true + } + }, "matrix_pins": { "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], "rows": ["B4", "B3", "A15", "B13", "B5"] diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk deleted file mode 100644 index b5f27c93eab..00000000000 --- a/keyboards/handwired/pill60/blackpill_f411/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Build Options -# change yes to no to disable -# -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/keyboard.json similarity index 78% rename from keyboards/handwired/prkl30/feather/info.json rename to keyboards/handwired/prkl30/feather/keyboard.json index a89fe9ec57f..721107e0646 100644 --- a/keyboards/handwired/prkl30/feather/info.json +++ b/keyboards/handwired/prkl30/feather/keyboard.json @@ -1,4 +1,14 @@ { + "features": { + "bluetooth": true, + "bootmagic": true, + "command": true, + "console": true, + "encoder": true, + "extrakey": false, + "mousekey": false, + "nkro": true + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk index aaab95b9e04..3437a35bdf1 100644 --- a/keyboards/handwired/prkl30/feather/rules.mk +++ b/keyboards/handwired/prkl30/feather/rules.mk @@ -1,18 +1,2 @@ # Processor frequency F_CPU = 8000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -ENCODER_ENABLE = yes -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. - -BLUETOOTH_ENABLE = yes diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/keyboard.json similarity index 100% rename from keyboards/handwired/promethium/info.json rename to keyboards/handwired/promethium/keyboard.json diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/keyboard.json similarity index 100% rename from keyboards/handwired/pterodactyl/info.json rename to keyboards/handwired/pterodactyl/keyboard.json diff --git a/keyboards/handwired/riblee_split/info.json b/keyboards/handwired/riblee_split/keyboard.json similarity index 100% rename from keyboards/handwired/riblee_split/info.json rename to keyboards/handwired/riblee_split/keyboard.json diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/keyboard.json similarity index 100% rename from keyboards/handwired/slash/info.json rename to keyboards/handwired/slash/keyboard.json diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/keyboard.json similarity index 100% rename from keyboards/handwired/split65/stm32/info.json rename to keyboards/handwired/split65/stm32/keyboard.json diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/keyboard.json similarity index 100% rename from keyboards/handwired/trackpoint/info.json rename to keyboards/handwired/trackpoint/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/4x6_right/info.json rename to keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json similarity index 100% rename from keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json rename to keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/keyboard.json similarity index 100% rename from keyboards/handwired/twadlee/tp69/info.json rename to keyboards/handwired/twadlee/tp69/keyboard.json diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/keyboard.json similarity index 92% rename from keyboards/handwired/uthol/rev3/info.json rename to keyboards/handwired/uthol/rev3/keyboard.json index a90e7a4a895..9b1a476b87c 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/keyboard.json @@ -1,7 +1,10 @@ { "keyboard_name": "UtholThree", "usb": { - "device_version": "0.0.3" + "device_version": "0.0.3", + "shared_endpoint": { + "keyboard": true + } }, "rgblight": { "led_count": 39, diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk deleted file mode 100644 index 1071cf62ee3..00000000000 --- a/keyboards/handwired/uthol/rev3/rules.mk +++ /dev/null @@ -1 +0,0 @@ -KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/keyboard.json similarity index 100% rename from keyboards/handwired/wulkan/info.json rename to keyboards/handwired/wulkan/keyboard.json diff --git a/keyboards/hardwareabstraction/handwire/info.json b/keyboards/hardwareabstraction/handwire/keyboard.json similarity index 100% rename from keyboards/hardwareabstraction/handwire/info.json rename to keyboards/hardwareabstraction/handwire/keyboard.json diff --git a/keyboards/hazel/bad_wings/info.json b/keyboards/hazel/bad_wings/keyboard.json similarity index 100% rename from keyboards/hazel/bad_wings/info.json rename to keyboards/hazel/bad_wings/keyboard.json diff --git a/keyboards/hhkb/ansi/32u2/info.json b/keyboards/hhkb/ansi/32u2/keyboard.json similarity index 100% rename from keyboards/hhkb/ansi/32u2/info.json rename to keyboards/hhkb/ansi/32u2/keyboard.json diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/keyboard.json similarity index 100% rename from keyboards/hhkb/jp/info.json rename to keyboards/hhkb/jp/keyboard.json diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/keyboard.json similarity index 100% rename from keyboards/hhkb/yang/info.json rename to keyboards/hhkb/yang/keyboard.json diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/46/0_1/info.json rename to keyboards/hillside/46/0_1/keyboard.json diff --git a/keyboards/hillside/46/0_1/rules.mk b/keyboards/hillside/46/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/46/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# If you add a haptic board, -# enable it and set its driver here or in your keymap folder -# The Pimoroni board's driver is DRV2605L -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/48/0_1/info.json rename to keyboards/hillside/48/0_1/keyboard.json diff --git a/keyboards/hillside/48/0_1/rules.mk b/keyboards/hillside/48/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/48/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# If you add a haptic board, -# enable it and set its driver here or in your keymap folder -# The Pimoroni board's driver is DRV2605L -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/keyboard.json similarity index 100% rename from keyboards/hillside/52/0_1/info.json rename to keyboards/hillside/52/0_1/keyboard.json diff --git a/keyboards/hillside/52/0_1/rules.mk b/keyboards/hillside/52/0_1/rules.mk deleted file mode 100644 index 89c84d8be9d..00000000000 --- a/keyboards/hillside/52/0_1/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -# If you add a haptic board, -# enable it and set its driver here or in your keymap folder -# The Pimoroni board's driver is DRV2605L -# HAPTIC_ENABLE = yes # Enable haptic driver -# HAPTIC_DRIVER = drv2605l diff --git a/keyboards/hineybush/hbcp/info.json b/keyboards/hineybush/hbcp/keyboard.json similarity index 100% rename from keyboards/hineybush/hbcp/info.json rename to keyboards/hineybush/hbcp/keyboard.json diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/keyboard.json similarity index 100% rename from keyboards/horrortroll/handwired_k552/info.json rename to keyboards/horrortroll/handwired_k552/keyboard.json diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/keyboard.json similarity index 100% rename from keyboards/horrortroll/lemon40/info.json rename to keyboards/horrortroll/lemon40/keyboard.json diff --git a/keyboards/horrortroll/nyx/rev1/info.json b/keyboards/horrortroll/nyx/rev1/keyboard.json similarity index 100% rename from keyboards/horrortroll/nyx/rev1/info.json rename to keyboards/horrortroll/nyx/rev1/keyboard.json diff --git a/keyboards/hotdox/info.json b/keyboards/hotdox/keyboard.json similarity index 100% rename from keyboards/hotdox/info.json rename to keyboards/hotdox/keyboard.json diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/keyboard.json similarity index 100% rename from keyboards/hs60/v1/info.json rename to keyboards/hs60/v1/keyboard.json diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/keyboard.json similarity index 100% rename from keyboards/hs60/v2/ansi/info.json rename to keyboards/hs60/v2/ansi/keyboard.json diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/keyboard.json similarity index 100% rename from keyboards/hs60/v2/hhkb/info.json rename to keyboards/hs60/v2/hhkb/keyboard.json diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/keyboard.json similarity index 100% rename from keyboards/hs60/v2/iso/info.json rename to keyboards/hs60/v2/iso/keyboard.json diff --git a/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json b/keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json similarity index 100% rename from keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json rename to keyboards/ibm/model_m_4th_gen/overnumpad_1xb/keyboard.json diff --git a/keyboards/ingrained/info.json b/keyboards/ingrained/keyboard.json similarity index 100% rename from keyboards/ingrained/info.json rename to keyboards/ingrained/keyboard.json diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/keyboard.json similarity index 100% rename from keyboards/inland/kb83/info.json rename to keyboards/inland/kb83/keyboard.json diff --git a/keyboards/inland/kb83/rgb_matrix_kb.inc b/keyboards/inland/kb83/rgb_matrix_kb.inc deleted file mode 100644 index 56e2bd31cbb..00000000000 --- a/keyboards/inland/kb83/rgb_matrix_kb.inc +++ /dev/null @@ -1,51 +0,0 @@ -// !!! DO NOT ADD #pragma once !!! // - -// Step 1. -// Declare custom effects using the RGB_MATRIX_EFFECT macro -// (note the lack of semicolon after the macro!) - -RGB_MATRIX_EFFECT(turn_off_rgb) -RGB_MATRIX_EFFECT(kb_reset_rgb) - -// Step 2. -// Define effects inside the `RGB_MATRIX_CUSTOM_EFFECT_IMPLS` ifdef block - -#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS - -// e.g: A simple effect, self-contained within a single method -static bool turn_off_rgb(effect_params_t *params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - for (uint8_t i = led_min; i < led_max; i++) { - rgb_matrix_set_color(i, 0x00, 0x00, 0x00); - } - return rgb_matrix_check_finished_leds(led_max); -} - -// e.g: A more complex effect, relying on external methods and state, with -// dedicated init and run methods -static uint8_t some_global_state; -static void kb_reset_rgb_init(effect_params_t* params) { - some_global_state = 0; -} -static bool kb_reset_rgb_run(effect_params_t* params) { - RGB_MATRIX_USE_LIMITS(led_min, led_max); - some_global_state++; - if(some_global_state&0x01){ - for (uint8_t i = led_min; i < led_max; i++) - rgb_matrix_set_color(i, 0, 0, 0); - } - else{ - for (uint8_t i = led_min; i < led_max; i++) - rgb_matrix_set_color(i, 0xc0, 0xc0, 0xc0); - } - if(some_global_state>=7) - rgb_matrix_init(); - return rgb_matrix_check_finished_leds(led_max); -} - -static bool kb_reset_rgb(effect_params_t* params) { - if (params->init) kb_reset_rgb_init(params); - return kb_reset_rgb_run(params); -} - -#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/keyboards/inland/kb83/rules.mk b/keyboards/inland/kb83/rules.mk deleted file mode 100644 index 2bdd4fd92e8..00000000000 --- a/keyboards/inland/kb83/rules.mk +++ /dev/null @@ -1 +0,0 @@ -#RGB_MATRIX_CUSTOM_USER = yes diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/keyboard.json similarity index 100% rename from keyboards/input_club/ergodox_infinity/info.json rename to keyboards/input_club/ergodox_infinity/keyboard.json