diff options
author | QMK Bot <hello@qmk.fm> | 2022-08-02 18:39:44 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-08-02 18:39:44 +0000 |
commit | 90259eb012d18e772847ee5939abc3a85d913ee5 (patch) | |
tree | 86ee300c8be735c6b3321ec4db7494c7fa572729 /keyboards/oddball | |
parent | 7883306466f5e3b1200f1e53fe7ece1ed1e4def8 (diff) | |
parent | be5b1a24bf650d9bc0bff4cf3b27a9c641d262fd (diff) | |
download | qmk_firmware-90259eb012d18e772847ee5939abc3a85d913ee5.tar.gz qmk_firmware-90259eb012d18e772847ee5939abc3a85d913ee5.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/oddball')
-rw-r--r-- | keyboards/oddball/config.h | 7 | ||||
-rw-r--r-- | keyboards/oddball/info.json | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h index 1aaead0cae..30e16490c8 100644 --- a/keyboards/oddball/config.h +++ b/keyboards/oddball/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0xCA49 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Alexander Tulloh -#define PRODUCT Oddball - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 6 diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json index ab1eb1f2e7..84e512dbdc 100644 --- a/keyboards/oddball/info.json +++ b/keyboards/oddball/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Oddball", + "manufacturer": "Alexander Tulloh", "url": "https://atulloh.github.io/oddball", "maintainer": "Alexander Tulloh", + "usb": { + "vid": "0xFEED", + "pid": "0xCA49", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |