From 201a914beb7a07d8e08b1cbfa8dd35a768f6ae3a Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:42:49 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: P-R (#18091) --- keyboards/planck/config.h | 5 ----- keyboards/planck/ez/base/info.json | 6 ++++++ keyboards/planck/ez/base/rules.mk | 0 keyboards/planck/ez/config.h | 11 ----------- keyboards/planck/ez/glow/config.h | 25 ------------------------- keyboards/planck/ez/glow/info.json | 6 ++++++ keyboards/planck/ez/info.json | 6 +++++- keyboards/planck/ez/rules.mk | 2 ++ keyboards/planck/info.json | 1 - keyboards/planck/light/config.h | 5 ----- keyboards/planck/light/info.json | 6 ++++++ keyboards/planck/rev1/config.h | 4 ---- keyboards/planck/rev1/info.json | 8 +++++++- keyboards/planck/rev2/config.h | 4 ---- keyboards/planck/rev2/info.json | 8 +++++++- keyboards/planck/rev3/config.h | 4 ---- keyboards/planck/rev3/info.json | 8 +++++++- keyboards/planck/rev4/config.h | 4 ---- keyboards/planck/rev4/info.json | 8 +++++++- keyboards/planck/rev5/config.h | 4 ---- keyboards/planck/rev5/info.json | 8 +++++++- keyboards/planck/rev6/config.h | 4 ---- keyboards/planck/rev6/info.json | 8 +++++++- keyboards/planck/rev6_drop/config.h | 6 ------ keyboards/planck/rev6_drop/info.json | 8 +++++++- keyboards/planck/thk/config.h | 4 ---- keyboards/planck/thk/info.json | 6 ++++++ 27 files changed, 80 insertions(+), 89 deletions(-) create mode 100644 keyboards/planck/ez/base/info.json create mode 100644 keyboards/planck/ez/base/rules.mk delete mode 100644 keyboards/planck/ez/glow/config.h create mode 100644 keyboards/planck/ez/glow/info.json delete mode 100644 keyboards/planck/rev1/config.h delete mode 100644 keyboards/planck/rev2/config.h delete mode 100644 keyboards/planck/rev3/config.h delete mode 100644 keyboards/planck/rev4/config.h delete mode 100644 keyboards/planck/rev5/config.h (limited to 'keyboards/planck') diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h index 8fb9dda32a..95ba718abc 100644 --- a/keyboards/planck/config.h +++ b/keyboards/planck/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x03A8 -#define MANUFACTURER OLKB -#define PRODUCT Planck - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/planck/ez/base/info.json b/keyboards/planck/ez/base/info.json new file mode 100644 index 0000000000..07167a8c2a --- /dev/null +++ b/keyboards/planck/ez/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Planck EZ", + "usb": { + "pid": "0xC6CE" + } +} diff --git a/keyboards/planck/ez/base/rules.mk b/keyboards/planck/ez/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index d948fb5808..c9ed9e59ba 100644 --- a/keyboards/planck/ez/config.h +++ b/keyboards/planck/ez/config.h @@ -18,17 +18,6 @@ #pragma once -#undef VENDOR_ID -#define VENDOR_ID 0x3297 -#undef PRODUCT_ID -#define PRODUCT_ID 0xC6CE -#undef MANUFACTURER -#define MANUFACTURER ZSA Technology Labs -#undef PRODUCT -#define PRODUCT Planck EZ -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0000 - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/planck/ez/glow/config.h b/keyboards/planck/ez/glow/config.h deleted file mode 100644 index 55ce289010..0000000000 --- a/keyboards/planck/ez/glow/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2018 Jack Humbert - * Copyright 2015 ZSA Technology Labs Inc (@zsa) - * Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) - * - * 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 - -#undef PRODUCT_ID -#define PRODUCT_ID 0xC6CF - -#undef PRODUCT -#define PRODUCT Planck EZ Glow diff --git a/keyboards/planck/ez/glow/info.json b/keyboards/planck/ez/glow/info.json new file mode 100644 index 0000000000..4852258570 --- /dev/null +++ b/keyboards/planck/ez/glow/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Planck EZ Glow", + "usb": { + "pid": "0xC6CF" + } +} diff --git a/keyboards/planck/ez/info.json b/keyboards/planck/ez/info.json index 6c9332b052..4008cb7057 100644 --- a/keyboards/planck/ez/info.json +++ b/keyboards/planck/ez/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Planck EZ", + "manufacturer": "ZSA Technology Labs", "url": "https://ergodox-ez.com/pages/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x3297", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index 61d3eb4d4f..47f140585b 100644 --- a/keyboards/planck/ez/rules.mk +++ b/keyboards/planck/ez/rules.mk @@ -29,3 +29,5 @@ RGBLIGHT_SUPPORTED = no BAKCLIGHT_SUPPORTED = no MOUSE_SHARED_EP = no + +DEFAULT_FOLDER = planck/ez/base diff --git a/keyboards/planck/info.json b/keyboards/planck/info.json index a4710d781f..cc57b6da60 100644 --- a/keyboards/planck/info.json +++ b/keyboards/planck/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Planck", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", "layouts": { diff --git a/keyboards/planck/light/config.h b/keyboards/planck/light/config.h index cc7f1fe940..67b42e8c08 100644 --- a/keyboards/planck/light/config.h +++ b/keyboards/planck/light/config.h @@ -2,11 +2,6 @@ #include "config_common.h" -#undef PRODUCT -#define PRODUCT Planck Light -#define PRODUCT_ID 0xBEA2 -#define DEVICE_VER 0x0001 - #undef MATRIX_ROW_PINS #undef MATRIX_COL_PINS diff --git a/keyboards/planck/light/info.json b/keyboards/planck/light/info.json index 6169a8f991..d55de09d47 100644 --- a/keyboards/planck/light/info.json +++ b/keyboards/planck/light/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Planck Light", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xBEA2", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev1/config.h b/keyboards/planck/rev1/config.h deleted file mode 100644 index 82f9acd8f9..0000000000 --- a/keyboards/planck/rev1/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0001 diff --git a/keyboards/planck/rev1/info.json b/keyboards/planck/rev1/info.json index 04c6775042..2fcff227c6 100644 --- a/keyboards/planck/rev1/info.json +++ b/keyboards/planck/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 1", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev2/config.h b/keyboards/planck/rev2/config.h deleted file mode 100644 index 09ec6c4470..0000000000 --- a/keyboards/planck/rev2/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0002 diff --git a/keyboards/planck/rev2/info.json b/keyboards/planck/rev2/info.json index 42839397cb..5d4137a9d6 100644 --- a/keyboards/planck/rev2/info.json +++ b/keyboards/planck/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 2", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev3/config.h b/keyboards/planck/rev3/config.h deleted file mode 100644 index a57e42dfbc..0000000000 --- a/keyboards/planck/rev3/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0003 diff --git a/keyboards/planck/rev3/info.json b/keyboards/planck/rev3/info.json index 88a8741ad1..d9eaea8f41 100644 --- a/keyboards/planck/rev3/info.json +++ b/keyboards/planck/rev3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 3", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev4/config.h b/keyboards/planck/rev4/config.h deleted file mode 100644 index c802efa8d4..0000000000 --- a/keyboards/planck/rev4/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0004 diff --git a/keyboards/planck/rev4/info.json b/keyboards/planck/rev4/info.json index 5c4d9af194..f5339f3671 100644 --- a/keyboards/planck/rev4/info.json +++ b/keyboards/planck/rev4/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 4", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.4" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev5/config.h b/keyboards/planck/rev5/config.h deleted file mode 100644 index c2ff086f33..0000000000 --- a/keyboards/planck/rev5/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAE01 -#define DEVICE_VER 0x0005 diff --git a/keyboards/planck/rev5/info.json b/keyboards/planck/rev5/info.json index f5d667a507..4ade05c657 100644 --- a/keyboards/planck/rev5/info.json +++ b/keyboards/planck/rev5/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 5", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xAE01", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT_planck_1x2uC": { "layout": [ diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h index 778fa12fcc..50865c1686 100644 --- a/keyboards/planck/rev6/config.h +++ b/keyboards/planck/rev6/config.h @@ -17,10 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0xA4F9 -#define DEVICE_VER 0x0006 - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/planck/rev6/info.json b/keyboards/planck/rev6/info.json index 114a971294..bde896203f 100644 --- a/keyboards/planck/rev6/info.json +++ b/keyboards/planck/rev6/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 6", + "keyboard_name": "Planck", + "manufacturer": "OLKB", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xA4F9", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h index f41d46b889..a6c024d78d 100644 --- a/keyboards/planck/rev6_drop/config.h +++ b/keyboards/planck/rev6_drop/config.h @@ -17,12 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0xA4F9 -#define DEVICE_VER 0x0006 -#undef MANUFACTURER -#define MANUFACTURER Drop - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/planck/rev6_drop/info.json b/keyboards/planck/rev6_drop/info.json index 114a971294..cd8a932139 100644 --- a/keyboards/planck/rev6_drop/info.json +++ b/keyboards/planck/rev6_drop/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Planck rev 6", + "keyboard_name": "Planck", + "manufacturer": "Drop", "url": "https://olkb.com/planck", "maintainer": "jackhumbert", + "usb": { + "vid": "0x03A8", + "pid": "0xA4F9", + "device_version": "0.0.6" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/planck/thk/config.h b/keyboards/planck/thk/config.h index 845ef60b08..8ee347d284 100644 --- a/keyboards/planck/thk/config.h +++ b/keyboards/planck/thk/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #pragma once #include "config_common.h" -#define DEVICE_VER 0x0000 -#undef PRODUCT -#define PRODUCT Planck THK -#define PRODUCT_ID 0x25A7 // THK has a different pin-out #undef MATRIX_ROW_PINS diff --git a/keyboards/planck/thk/info.json b/keyboards/planck/thk/info.json index 70e1f0bd07..c8689737c0 100644 --- a/keyboards/planck/thk/info.json +++ b/keyboards/planck/thk/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Planck THK", + "manufacturer": "OLKB", "maintainer": "Erovia", "url": "https://olkb.com/planck", + "usb": { + "vid": "0x03A8", + "pid": "0x25A7", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_planck_grid": "LAYOUT_ortho_4x12", "LAYOUT_planck_mit": "LAYOUT_planck_1x2uC" -- cgit v1.2.1