diff options
| author | Ryan <fauxpark@gmail.com> | 2022-07-28 23:12:40 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 14:12:40 +0100 |
| commit | 920f9837677749541b88b02ecb245539943140e2 (patch) | |
| tree | ef2d2162ccb7302a208983956e1771e1af918ee6 /keyboards/hhkb | |
| parent | e7affd05417a48b1e5c0948a24034227384a5d13 (diff) | |
| download | qmk_firmware-920f9837677749541b88b02ecb245539943140e2.tar.gz qmk_firmware-920f9837677749541b88b02ecb245539943140e2.zip | |
Move keyboard USB IDs and strings to data driven: H (#17821)
Diffstat (limited to 'keyboards/hhkb')
| -rw-r--r-- | keyboards/hhkb/ansi/config.h | 7 | ||||
| -rw-r--r-- | keyboards/hhkb/ansi/info.json | 8 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/config.h | 7 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/info.json | 8 | ||||
| -rw-r--r-- | keyboards/hhkb/yang/config.h | 7 | ||||
| -rw-r--r-- | keyboards/hhkb/yang/info.json | 8 |
6 files changed, 21 insertions, 24 deletions
diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h index 8307fc1679..f2ba9fd74a 100644 --- a/keyboards/hhkb/ansi/config.h +++ b/keyboards/hhkb/ansi/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4848 // HH = happy hacking -#define PRODUCT_ID 0x0001 // ANSI HHKB -#define DEVICE_VER 0x0104 -#define MANUFACTURER q.m.k -#define PRODUCT HHKB mod - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/hhkb/ansi/info.json b/keyboards/hhkb/ansi/info.json index d2a6e42318..fdc8363141 100644 --- a/keyboards/hhkb/ansi/info.json +++ b/keyboards/hhkb/ansi/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "HHKB", + "keyboard_name": "ANSI", + "manufacturer": "HHKB", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4848", + "pid": "0x0001", + "device_version": "1.0.4" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h index 04ee61c768..a3e7dbd3a6 100644 --- a/keyboards/hhkb/jp/config.h +++ b/keyboards/hhkb/jp/config.h @@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4848 // HH = happy hacking -#define PRODUCT_ID 0x0002 // HHKB JP -#define DEVICE_VER 0x0104 -#define MANUFACTURER q.m.k -#define PRODUCT HHKB mod - /* key matrix size */ #define MATRIX_ROWS 16 #define MATRIX_COLS 8 diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json index ee9d1de53a..dd1cfbc870 100644 --- a/keyboards/hhkb/jp/info.json +++ b/keyboards/hhkb/jp/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "HHKB JP", + "keyboard_name": "JP", + "manufacturer": "HHKB", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4848", + "pid": "0x0002", + "device_version": "1.0.4" + }, "layouts": { "LAYOUT_jp": { "layout": [ diff --git a/keyboards/hhkb/yang/config.h b/keyboards/hhkb/yang/config.h index 693b2501bb..e1fa406a0b 100644 --- a/keyboards/hhkb/yang/config.h +++ b/keyboards/hhkb/yang/config.h @@ -20,13 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4848 // HH = happy hacking -#define PRODUCT_ID 0x0001 // ANSI HHKB -#define DEVICE_VER 0x0104 -#define MANUFACTURER YANG -#define PRODUCT HHKB BLE Keyboard - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 8 diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json index b38b8a6881..23e26fe2cb 100644 --- a/keyboards/hhkb/yang/info.json +++ b/keyboards/hhkb/yang/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "YANG HHKB BLE", + "keyboard_name": "HHKB BLE", + "manufacturer": "YANG", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x4848", + "pid": "0x0001", + "device_version": "1.0.4" + }, "layouts": { "LAYOUT_60_hhkb": { "layout": [ |