From 835c971f78b5d995bb58f0889fac00aac348de52 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:39:35 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) --- keyboards/keyhive/navi10/info.json | 5 +++++ keyboards/keyhive/navi10/rev0/config.h | 7 ------- keyboards/keyhive/navi10/rev0/info.json | 5 +++++ keyboards/keyhive/navi10/rev2/config.h | 7 ------- keyboards/keyhive/navi10/rev2/info.json | 5 +++++ keyboards/keyhive/navi10/rev3/config.h | 7 ------- keyboards/keyhive/navi10/rev3/info.json | 5 +++++ keyboards/keyhive/uno/info.json | 6 +++++- keyboards/keyhive/uno/rev1/config.h | 7 ------- keyboards/keyhive/uno/rev1/info.json | 6 ++++++ keyboards/keyhive/uno/rev2/config.h | 7 ------- keyboards/keyhive/uno/rev2/info.json | 6 ++++++ 12 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 keyboards/keyhive/navi10/rev0/info.json create mode 100644 keyboards/keyhive/navi10/rev2/info.json create mode 100644 keyboards/keyhive/navi10/rev3/info.json create mode 100644 keyboards/keyhive/uno/rev1/info.json create mode 100644 keyboards/keyhive/uno/rev2/info.json (limited to 'keyboards/keyhive') diff --git a/keyboards/keyhive/navi10/info.json b/keyboards/keyhive/navi10/info.json index e3fc49fbed..ecafbeb089 100644 --- a/keyboards/keyhive/navi10/info.json +++ b/keyboards/keyhive/navi10/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "Navi10", + "manufacturer": "emdarcher", "url": "", "maintainer": "emdarcher", + "usb": { + "vid": "0xFEED", + "pid": "0x0000" + }, "layouts": { "LAYOUT": { "layout": [{"label":"Fn", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Del", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"Up", "x":1, "y":3}, {"label":"Left", "x":0, "y":4}, {"label":"Down", "x":1, "y":4}, {"label":"Right", "x":2, "y":4}] diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h index 22a985c280..ea445f8425 100644 --- a/keyboards/keyhive/navi10/rev0/config.h +++ b/keyboards/keyhive/navi10/rev0/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 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER emdarcher -#define PRODUCT Navi10 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/keyhive/navi10/rev0/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h index 1dfb210b03..469d29c9e9 100644 --- a/keyboards/keyhive/navi10/rev2/config.h +++ b/keyboards/keyhive/navi10/rev2/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 0x0000 -#define DEVICE_VER 0x0002 -#define MANUFACTURER emdarcher -#define PRODUCT Navi10 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/keyhive/navi10/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h index 205535273a..c6bcf808ea 100644 --- a/keyboards/keyhive/navi10/rev3/config.h +++ b/keyboards/keyhive/navi10/rev3/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 0x0000 -#define DEVICE_VER 0x0003 -#define MANUFACTURER emdarcher -#define PRODUCT Navi10 - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 3 diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json new file mode 100644 index 0000000000..b377cdff00 --- /dev/null +++ b/keyboards/keyhive/navi10/rev3/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.3" + } +} diff --git a/keyboards/keyhive/uno/info.json b/keyboards/keyhive/uno/info.json index d426f9e426..9d39163a1b 100644 --- a/keyboards/keyhive/uno/info.json +++ b/keyboards/keyhive/uno/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Uno", + "manufacturer": "Broekhuijsen", "url": "https://www.reddit.com/r/mechmarket/comments/gyijm7/gb_uno/", "maintainer": "Snipeye", + "usb": { + "vid": "0xFEED", + "pid": "0xACC8" + }, "layouts": { "LAYOUT": { "layout": [ {"x": 0, "y": 0 }] diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h index 11c84ad2ab..279deab5bd 100644 --- a/keyboards/keyhive/uno/rev1/config.h +++ b/keyboards/keyhive/uno/rev1/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xACC8 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Broekhuijsen -#define PRODUCT Uno rev1 - #define RGBLIGHT_EFFECT_RAINBOW_MOOD // #define RGBLIGHT_ANIMATIONS diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json new file mode 100644 index 0000000000..69d6dfba0d --- /dev/null +++ b/keyboards/keyhive/uno/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Uno rev1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h index 37ea08c017..2fc5baaef2 100644 --- a/keyboards/keyhive/uno/rev2/config.h +++ b/keyboards/keyhive/uno/rev2/config.h @@ -17,13 +17,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xACC8 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Broekhuijsen -#define PRODUCT Uno rev2 - #define RGBLIGHT_EFFECT_RAINBOW_MOOD /* ENCODER */ diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json new file mode 100644 index 0000000000..787f306351 --- /dev/null +++ b/keyboards/keyhive/uno/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Uno rev2", + "usb": { + "device_version": "0.0.2" + } +} -- cgit v1.2.3