From 3a7dbc89817950709717d6dcec18a6eccbcc2d28 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 14 Aug 2022 12:16:16 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: B-C (#17945) --- keyboards/bastardkb/charybdis/3x5/config.h | 6 ------ keyboards/bastardkb/charybdis/3x5/info.json | 6 ++++++ keyboards/bastardkb/charybdis/4x6/config.h | 6 ------ keyboards/bastardkb/charybdis/4x6/info.json | 6 ++++++ 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'keyboards/bastardkb') diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h index 89b896bc35..6d62caf5d2 100644 --- a/keyboards/bastardkb/charybdis/3x5/config.h +++ b/keyboards/bastardkb/charybdis/3x5/config.h @@ -18,12 +18,6 @@ #pragma once -#define VENDOR_ID 0xA8F8 -#define PRODUCT_ID 0x1832 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bastard Keyboards -#define PRODUCT Charybdis Nano - /* Key matrix configuration. */ // Rows are doubled-up. diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json index 03fb05664f..935b1f7249 100644 --- a/keyboards/bastardkb/charybdis/3x5/info.json +++ b/keyboards/bastardkb/charybdis/3x5/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Charybdis Nano", + "manufacturer": "Bastard Keyboards", "url": "https://www.bastardkb.com", "maintainer": "Quentin Lebastard", + "usb": { + "vid": "0xA8F8", + "pid": "0x1832", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_charybdis_3x5": { "layout": [ diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h index 423f12fdbe..5d9f446624 100644 --- a/keyboards/bastardkb/charybdis/4x6/config.h +++ b/keyboards/bastardkb/charybdis/4x6/config.h @@ -18,12 +18,6 @@ #pragma once -#define VENDOR_ID 0xA8F8 -#define PRODUCT_ID 0x1833 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Bastard Keyboards -#define PRODUCT Charybdis - /* Key matrix configuration. */ // Rows are doubled-up. diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json index 956dfe88f5..3e588db9be 100644 --- a/keyboards/bastardkb/charybdis/4x6/info.json +++ b/keyboards/bastardkb/charybdis/4x6/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Charybdis", + "manufacturer": "Bastard Keyboards", "url": "https://www.bastardkb.com", "maintainer": "Quentin Lebastard", + "usb": { + "vid": "0xA8F8", + "pid": "0x1833", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_charybdis_4x6": { "layout": [ -- cgit v1.2.3