From f4dcce7e5975276ef41d882a15e6a459b6b3689d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:45:28 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090) --- keyboards/maple_computing/christmas_tree/V2017/config.h | 5 ----- keyboards/maple_computing/christmas_tree/V2017/info.json | 5 +++++ keyboards/maple_computing/christmas_tree/config.h | 6 ------ keyboards/maple_computing/christmas_tree/info.json | 5 +++++ keyboards/maple_computing/ivy/config.h | 6 ------ keyboards/maple_computing/ivy/rev1/config.h | 2 -- keyboards/maple_computing/ivy/rev1/info.json | 8 +++++++- keyboards/maple_computing/launchpad/config.h | 6 ------ keyboards/maple_computing/launchpad/rev1/config.h | 2 -- keyboards/maple_computing/launchpad/rev1/info.json | 8 +++++++- keyboards/maple_computing/lets_split_eh/config.h | 7 ------- keyboards/maple_computing/lets_split_eh/eh/info.json | 8 +++++++- keyboards/maple_computing/minidox/config.h | 6 ------ keyboards/maple_computing/minidox/rev1/config.h | 2 -- keyboards/maple_computing/minidox/rev1/info.json | 6 ++++++ 15 files changed, 37 insertions(+), 45 deletions(-) delete mode 100644 keyboards/maple_computing/christmas_tree/V2017/config.h create mode 100644 keyboards/maple_computing/christmas_tree/V2017/info.json (limited to 'keyboards/maple_computing') diff --git a/keyboards/maple_computing/christmas_tree/V2017/config.h b/keyboards/maple_computing/christmas_tree/V2017/config.h deleted file mode 100644 index abc94749a8..0000000000 --- a/keyboards/maple_computing/christmas_tree/V2017/config.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "config_common.h" - -#define DEVICE_VER 0x2017 diff --git a/keyboards/maple_computing/christmas_tree/V2017/info.json b/keyboards/maple_computing/christmas_tree/V2017/info.json new file mode 100644 index 0000000000..6d00c2519f --- /dev/null +++ b/keyboards/maple_computing/christmas_tree/V2017/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "20.1.7" + } +} diff --git a/keyboards/maple_computing/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h index 531c5996d2..c8070c2487 100644 --- a/keyboards/maple_computing/christmas_tree/config.h +++ b/keyboards/maple_computing/christmas_tree/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3070 -#define MANUFACTURER Maple Computing -#define PRODUCT Christmas Tree - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 1 diff --git a/keyboards/maple_computing/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json index 5d24218c70..2f5dfef702 100644 --- a/keyboards/maple_computing/christmas_tree/info.json +++ b/keyboards/maple_computing/christmas_tree/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "Christmas Tree", + "manufacturer": "Maple Computing", "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/", "maintainer": "That-Canadian", + "usb": { + "vid": "0xFEED", + "pid": "0x3070" + }, "layouts": { "LAYOUT": { "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}] diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h index 130f2e0b61..96fb23736c 100644 --- a/keyboards/maple_computing/ivy/config.h +++ b/keyboards/maple_computing/ivy/config.h @@ -18,12 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1337 -#define PRODUCT_ID 0x6012 -#define MANUFACTURER Maple Computing -#define PRODUCT Ivy - /* key matrix size */ #define MATRIX_ROWS 3 #define MATRIX_COLS 3 diff --git a/keyboards/maple_computing/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h index 9b88b89e5e..00d6b36d0f 100644 --- a/keyboards/maple_computing/ivy/rev1/config.h +++ b/keyboards/maple_computing/ivy/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0001 - /* Let's Macro V2 pin-out */ #define MATRIX_ROW_PINS { F1, B2, D3 } #define MATRIX_COL_PINS { F5, B3, D5 } diff --git a/keyboards/maple_computing/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json index c5045bd80f..4bacbdb9b9 100644 --- a/keyboards/maple_computing/ivy/rev1/info.json +++ b/keyboards/maple_computing/ivy/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "IVY", + "keyboard_name": "Ivy", + "manufacturer": "Maple Computing", "url": "", "maintainer": "That-Canadian", + "usb": { + "vid": "0x1337", + "pid": "0x6012", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h index 901c63c93b..92d597508a 100644 --- a/keyboards/maple_computing/launchpad/config.h +++ b/keyboards/maple_computing/launchpad/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1337 -#define PRODUCT_ID 0x6007 -#define MANUFACTURER Maple Computing -#define PRODUCT Launch Pad - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 2 diff --git a/keyboards/maple_computing/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h index debc28fab3..54a67caaed 100644 --- a/keyboards/maple_computing/launchpad/rev1/config.h +++ b/keyboards/maple_computing/launchpad/rev1/config.h @@ -19,8 +19,6 @@ along with this program. If not, see . #include "../config.h" -#define DEVICE_VER 0x0001 - /* Let's Macro V2 pin-out */ #define MATRIX_ROW_PINS { C6, B1, B3, D7 } #define MATRIX_COL_PINS { D2, F7 } diff --git a/keyboards/maple_computing/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json index c8ba35c966..4931670cb4 100644 --- a/keyboards/maple_computing/launchpad/rev1/info.json +++ b/keyboards/maple_computing/launchpad/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Launch Pad rev1", + "keyboard_name": "Launch Pad", + "manufacturer": "Maple Computing", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x1337", + "pid": "0x6007", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/lets_split_eh/config.h b/keyboards/maple_computing/lets_split_eh/config.h index 787b9783b8..671cd4d34a 100644 --- a/keyboards/maple_computing/lets_split_eh/config.h +++ b/keyboards/maple_computing/lets_split_eh/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xE401 -#define DEVICE_VER 0x0100 -#define MANUFACTURER That-Canadian -#define PRODUCT Lets Split Eh? - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/maple_computing/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json index c241fa3813..352461ae50 100644 --- a/keyboards/maple_computing/lets_split_eh/eh/info.json +++ b/keyboards/maple_computing/lets_split_eh/eh/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Let's Split", + "keyboard_name": "Lets Split Eh?", + "manufacturer": "That-Canadian", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0xE401", + "device_version": "1.0.0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h index 613e45977c..9b3adc2602 100644 --- a/keyboards/maple_computing/minidox/config.h +++ b/keyboards/maple_computing/minidox/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x3060 -#define MANUFACTURER That-Canadian -#define PRODUCT MiniDox - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/maple_computing/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h index 734ca562fd..6867fee4b5 100644 --- a/keyboards/maple_computing/minidox/rev1/config.h +++ b/keyboards/maple_computing/minidox/rev1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0001 - // wiring of each half #define MATRIX_ROW_PINS { B2, B6, B4, B5 } #define MATRIX_COL_PINS { F4, D3, D2, D1, D4 } diff --git a/keyboards/maple_computing/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json index 47ed14dab0..6a253e14a6 100644 --- a/keyboards/maple_computing/minidox/rev1/info.json +++ b/keyboards/maple_computing/minidox/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "MiniDox", + "manufacturer": "That-Canadian", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x3060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_split_3x5_3": { "layout": [{"x":0, "y":0.375}, {"x":1, "y":0.125}, {"x":2, "y":0}, {"x":3, "y":0.125}, {"x":4, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.125}, {"x":9, "y":0}, {"x":10, "y":0.125}, {"x":11, "y":0.375}, {"x":0, "y":1.375}, {"x":1, "y":1.125}, {"x":2, "y":1}, {"x":3, "y":1.125}, {"x":4, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.125}, {"x":9, "y":1}, {"x":10, "y":1.125}, {"x":11, "y":1.375}, {"x":0, "y":2.375}, {"x":1, "y":2.125}, {"x":2, "y":2}, {"x":3, "y":2.125}, {"x":4, "y":2.25}, {"x":7, "y":2.25}, {"x":8, "y":2.125}, {"x":9, "y":2}, {"x":10, "y":2.125}, {"x":11, "y":2.375}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":3.75, "h":2}, {"x":6.5, "y":3.75, "h":2}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}] -- cgit v1.2.3