From cf41c24db853f825150802d30dce73ba507b69c0 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 25 Aug 2022 00:28:38 +1000 Subject: Move keyboard USB IDs and strings to data driven: develop (#18152) * Move keyboard USB IDs and strings to data driven: develop * Also do new onekeys --- keyboards/adafruit/macropad/config.h | 6 ------ keyboards/adafruit/macropad/info.json | 8 +++++++- keyboards/gmmk/gmmk2/p96/ansi/config.h | 21 --------------------- keyboards/gmmk/gmmk2/p96/ansi/info.json | 6 ++++++ keyboards/gmmk/gmmk2/p96/config.h | 7 ------- keyboards/gmmk/gmmk2/p96/iso/config.h | 21 --------------------- keyboards/gmmk/gmmk2/p96/iso/info.json | 6 ++++++ keyboards/handwired/onekey/bluepill_f103c6/config.h | 2 -- .../handwired/onekey/bluepill_f103c6/info.json | 3 +++ keyboards/handwired/onekey/kb2040/config.h | 1 - keyboards/handwired/onekey/kb2040/info.json | 3 +++ keyboards/handwired/onekey/rp2040/config.h | 1 - keyboards/handwired/onekey/rp2040/info.json | 3 +++ keyboards/handwired/onekey/teensy_35/config.h | 2 -- keyboards/handwired/onekey/teensy_35/info.json | 3 +++ keyboards/jkeys_design/gentleman65_se_s/config.h | 7 ------- keyboards/jkeys_design/gentleman65_se_s/info.json | 8 +++++++- 17 files changed, 38 insertions(+), 70 deletions(-) delete mode 100644 keyboards/gmmk/gmmk2/p96/ansi/config.h delete mode 100644 keyboards/gmmk/gmmk2/p96/iso/config.h create mode 100644 keyboards/handwired/onekey/bluepill_f103c6/info.json create mode 100644 keyboards/handwired/onekey/kb2040/info.json create mode 100644 keyboards/handwired/onekey/rp2040/info.json create mode 100644 keyboards/handwired/onekey/teensy_35/info.json diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h index 1e055e273b..cc4cbc940c 100644 --- a/keyboards/adafruit/macropad/config.h +++ b/keyboards/adafruit/macropad/config.h @@ -22,12 +22,6 @@ #define MATRIX_ROWS 5 #define MATRIX_COLS 3 -#define VENDOR_ID 0x239A -#define PRODUCT_ID 0x0108 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Adafruit -#define PRODUCT Macropad RP2040 - /* Keyboard Matrix Assignments */ // clang-format off #define DIRECT_PINS { \ diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json index ffa31780a9..e9bd7d85b1 100644 --- a/keyboards/adafruit/macropad/info.json +++ b/keyboards/adafruit/macropad/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Adafruit Macropad RP2040", + "keyboard_name": "Macropad RP2040", + "manufacturer": "Adafruit", "url": "https://learn.adafruit.com/adafruit-macropad-rp2040", "maintainer": "Jpe230", + "usb": { + "vid": "0x239A", + "pid": "0x0108", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/gmmk2/p96/ansi/config.h b/keyboards/gmmk/gmmk2/p96/ansi/config.h deleted file mode 100644 index 9f386a4211..0000000000 --- a/keyboards/gmmk/gmmk2/p96/ansi/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Glorious, LLC - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "config_common.h" - -#define PRODUCT_ID 0x504B diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json index 1fe1530e4e..a5a1d6c3d5 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "GMMK V2 96 ANSI", + "manufacturer": "Glorious", "url": "http://www.pcgamingrace.com", "maintainer": "GloriousThrall", + "usb": { + "vid": "0x320F", + "pid": "0x504B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h index fec383c240..03a7f58538 100644 --- a/keyboards/gmmk/gmmk2/p96/config.h +++ b/keyboards/gmmk/gmmk2/p96/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define VENDOR_ID 0x320F -#define MANUFACTURER Glorious - -#define PRODUCT GMMK 2 96 - /* key matrix size */ #define MATRIX_ROWS 14 #define MATRIX_COLS 8 diff --git a/keyboards/gmmk/gmmk2/p96/iso/config.h b/keyboards/gmmk/gmmk2/p96/iso/config.h deleted file mode 100644 index 97a391b09c..0000000000 --- a/keyboards/gmmk/gmmk2/p96/iso/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Glorious, LLC - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "config_common.h" - -#define PRODUCT_ID 0x505A diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json index 96e9f1312b..df30007a01 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "GMMK V2 96 ISO", + "manufacturer": "Glorious", "url": "http://www.pcgamingrace.com", "maintainer": "GloriousThrall", + "usb": { + "vid": "0x320F", + "pid": "0x505A", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/handwired/onekey/bluepill_f103c6/config.h b/keyboards/handwired/onekey/bluepill_f103c6/config.h index e53aa63292..903277bd3b 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/config.h +++ b/keyboards/handwired/onekey/bluepill_f103c6/config.h @@ -18,8 +18,6 @@ #include "config_common.h" -#define PRODUCT Onekey Bluepill STM32F103C6 - #define MATRIX_COL_PINS { B0 } #define MATRIX_ROW_PINS { A7 } #define UNUSED_PINS diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json new file mode 100644 index 0000000000..0ef180f6ec --- /dev/null +++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Bluepill STM32F103C6" +} diff --git a/keyboards/handwired/onekey/kb2040/config.h b/keyboards/handwired/onekey/kb2040/config.h index 24a7d3a3eb..0bf7adf37f 100644 --- a/keyboards/handwired/onekey/kb2040/config.h +++ b/keyboards/handwired/onekey/kb2040/config.h @@ -5,7 +5,6 @@ #include "config_common.h" -#define PRODUCT Onekey Raspberry Pi RP2040 #define MATRIX_COL_PINS \ { GP4 } #define MATRIX_ROW_PINS \ diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json new file mode 100644 index 0000000000..696b772142 --- /dev/null +++ b/keyboards/handwired/onekey/kb2040/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey KB2040" +} diff --git a/keyboards/handwired/onekey/rp2040/config.h b/keyboards/handwired/onekey/rp2040/config.h index f4e45a8981..c0ef468aa9 100644 --- a/keyboards/handwired/onekey/rp2040/config.h +++ b/keyboards/handwired/onekey/rp2040/config.h @@ -5,7 +5,6 @@ #include "config_common.h" -#define PRODUCT Onekey Raspberry Pi RP2040 #define MATRIX_COL_PINS \ { GP4 } #define MATRIX_ROW_PINS \ diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json new file mode 100644 index 0000000000..696b021dc1 --- /dev/null +++ b/keyboards/handwired/onekey/rp2040/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey RP2040" +} diff --git a/keyboards/handwired/onekey/teensy_35/config.h b/keyboards/handwired/onekey/teensy_35/config.h index 18eebcaffd..13eaf1a4f6 100644 --- a/keyboards/handwired/onekey/teensy_35/config.h +++ b/keyboards/handwired/onekey/teensy_35/config.h @@ -19,8 +19,6 @@ // TODO: including this causes "error: expected identifier before '(' token" errors //#include "config_common.h" -#define PRODUCT Onekey Teensy 3.5 - #define MATRIX_COL_PINS { D5 } // 20/A6 #define MATRIX_ROW_PINS { B2 } // 19/A5 diff --git a/keyboards/handwired/onekey/teensy_35/info.json b/keyboards/handwired/onekey/teensy_35/info.json new file mode 100644 index 0000000000..99b6a236c5 --- /dev/null +++ b/keyboards/handwired/onekey/teensy_35/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Onekey Teensy 3.5" +} diff --git a/keyboards/jkeys_design/gentleman65_se_s/config.h b/keyboards/jkeys_design/gentleman65_se_s/config.h index 3cdef92f6d..effdb281e6 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/config.h +++ b/keyboards/jkeys_design/gentleman65_se_s/config.h @@ -20,13 +20,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x00FA -#define PRODUCT_ID 0x2322 -#define DEVICE_VER 0x0001 -#define MANUFACTURER JJ48_24 & Omar Afzal -#define PRODUCT Gentleman 65 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/jkeys_design/gentleman65_se_s/info.json b/keyboards/jkeys_design/gentleman65_se_s/info.json index da2f817a92..477940ffa6 100644 --- a/keyboards/jkeys_design/gentleman65_se_s/info.json +++ b/keyboards/jkeys_design/gentleman65_se_s/info.json @@ -1,7 +1,13 @@ { - "name": "The Gentleman 65 Suited Edition", + "keyboard_name": "Gentleman 65", + "manufacturer": "JJ48_24 & Omar Afzal", "url": "https://jkeys.design/products/gentleman-65-suited-edition", "maintainer": "OmarA", + "usb": { + "vid": "0x00FA", + "pid": "0x2322", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.5}, {"x":11.5, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] -- cgit v1.2.3