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/preonic/config.h | 5 ----- keyboards/preonic/info.json | 1 - keyboards/preonic/rev1/config.h | 23 ----------------------- keyboards/preonic/rev1/info.json | 9 +++++++++ keyboards/preonic/rev2/config.h | 23 ----------------------- keyboards/preonic/rev2/info.json | 9 +++++++++ keyboards/preonic/rev3/config.h | 4 ---- keyboards/preonic/rev3/info.json | 10 +++++++--- keyboards/preonic/rev3_drop/config.h | 6 ------ keyboards/preonic/rev3_drop/info.json | 10 +++++++--- 10 files changed, 32 insertions(+), 68 deletions(-) delete mode 100644 keyboards/preonic/rev1/config.h create mode 100644 keyboards/preonic/rev1/info.json delete mode 100644 keyboards/preonic/rev2/config.h create mode 100644 keyboards/preonic/rev2/info.json (limited to 'keyboards/preonic') diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index 6bcfa26380..c6c54cb6d7 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/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 Preonic - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/preonic/info.json b/keyboards/preonic/info.json index e49e964577..76571d7ce8 100644 --- a/keyboards/preonic/info.json +++ b/keyboards/preonic/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Preonic", "url": "https://olkb.com/preonic", "maintainer": "jackhumbert", "layouts": { diff --git a/keyboards/preonic/rev1/config.h b/keyboards/preonic/rev1/config.h deleted file mode 100644 index a1091b10ed..0000000000 --- a/keyboards/preonic/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2017 Jack Humbert - -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 DEVICE_VER 0x0001 -#define PRODUCT_ID 0x67F3 diff --git a/keyboards/preonic/rev1/info.json b/keyboards/preonic/rev1/info.json new file mode 100644 index 0000000000..1a44f3a2d6 --- /dev/null +++ b/keyboards/preonic/rev1/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Preonic", + "manufacturer": "OLKB", + "usb": { + "vid": "0x03A8", + "pid": "0x67F3", + "device_version": "0.0.1" + } +} diff --git a/keyboards/preonic/rev2/config.h b/keyboards/preonic/rev2/config.h deleted file mode 100644 index a62fed4850..0000000000 --- a/keyboards/preonic/rev2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2017 Jack Humbert - -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 DEVICE_VER 0x0002 -#define PRODUCT_ID 0x67F3 diff --git a/keyboards/preonic/rev2/info.json b/keyboards/preonic/rev2/info.json new file mode 100644 index 0000000000..5362084dc7 --- /dev/null +++ b/keyboards/preonic/rev2/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Preonic", + "manufacturer": "OLKB", + "usb": { + "vid": "0x03A8", + "pid": "0x67F3", + "device_version": "0.0.2" + } +} diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h index efa32d5916..5ade1f5f96 100644 --- a/keyboards/preonic/rev3/config.h +++ b/keyboards/preonic/rev3/config.h @@ -17,10 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define PRODUCT_ID 0xA649 - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/preonic/rev3/info.json b/keyboards/preonic/rev3/info.json index 8b7a65384e..1f13d480d2 100644 --- a/keyboards/preonic/rev3/info.json +++ b/keyboards/preonic/rev3/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Preonic rev. 3", - "url": "https://olkb.com/preonic", - "maintainer": "jackhumbert", + "keyboard_name": "Preonic", + "manufacturer": "OLKB", + "usb": { + "vid": "0x03A8", + "pid": "0xA649", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_preonic_1x2uC": { "layout": [ diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h index 813675eb84..5ade1f5f96 100644 --- a/keyboards/preonic/rev3_drop/config.h +++ b/keyboards/preonic/rev3_drop/config.h @@ -17,12 +17,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0003 -#define PRODUCT_ID 0xA649 -#undef MANUFACTURER -#define MANUFACTURER Drop - #undef MATRIX_ROWS #undef MATRIX_COLS /* key matrix size */ diff --git a/keyboards/preonic/rev3_drop/info.json b/keyboards/preonic/rev3_drop/info.json index 8b7a65384e..081d9e1983 100644 --- a/keyboards/preonic/rev3_drop/info.json +++ b/keyboards/preonic/rev3_drop/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Preonic rev. 3", - "url": "https://olkb.com/preonic", - "maintainer": "jackhumbert", + "keyboard_name": "Preonic", + "manufacturer": "Drop", + "usb": { + "vid": "0x03A8", + "pid": "0xA649", + "device_version": "0.0.3" + }, "layouts": { "LAYOUT_preonic_1x2uC": { "layout": [ -- cgit v1.2.1