diff options
author | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
commit | 61689ae6096f55148fdc4d333c6a74a79486eba3 (patch) | |
tree | 1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/kbnordic | |
parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/kbnordic')
-rw-r--r-- | keyboards/kbnordic/nordic60/rev_a/config.h | 7 | ||||
-rw-r--r-- | keyboards/kbnordic/nordic60/rev_a/info.json (renamed from keyboards/kbnordic/nordic60/info.json) | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/kbnordic/nordic60/rev_a/config.h b/keyboards/kbnordic/nordic60/rev_a/config.h index be555417d7..d2b6b5712b 100644 --- a/keyboards/kbnordic/nordic60/rev_a/config.h +++ b/keyboards/kbnordic/nordic60/rev_a/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4445 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KBNORDIC -#define PRODUCT Nordic60 Rev A - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/kbnordic/nordic60/info.json b/keyboards/kbnordic/nordic60/rev_a/info.json index aa5a82a002..99d8fe874c 100644 --- a/keyboards/kbnordic/nordic60/info.json +++ b/keyboards/kbnordic/nordic60/rev_a/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Nordic60 Rev A", + "manufacturer": "KBNORDIC", "url": "kbnordic.se", "maintainer": "4pplet", + "usb": { + "vid": "0x4445", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |