From 0ff8c4f6fd8cce95d9e96060121208f85b4d02cd Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 6 Aug 2022 18:59:13 +1000 Subject: [PATCH] Move keyboard USB IDs and strings to data driven: Z (#17927) --- keyboards/z12/config.h | 7 ------- keyboards/z12/info.json | 6 ++++++ keyboards/z34/config.h | 7 ------- keyboards/z34/info.json | 6 ++++++ keyboards/zfrontier/big_switch/config.h | 7 ------- keyboards/zfrontier/big_switch/info.json | 6 ++++++ keyboards/ziggurat/config.h | 7 ------- keyboards/ziggurat/info.json | 8 +++++++- keyboards/zj68/config.h | 7 ------- keyboards/zj68/info.json | 6 ++++++ keyboards/zlant/config.h | 7 ------- keyboards/zlant/info.json | 6 ++++++ keyboards/zoo/wampus/config.h | 7 ------- keyboards/zoo/wampus/info.json | 8 +++++++- keyboards/ztboards/after/config.h | 7 ------- keyboards/ztboards/after/info.json | 8 +++++++- keyboards/ztboards/noon/config.h | 7 ------- keyboards/ztboards/noon/info.json | 8 +++++++- keyboards/zvecr/split_blackpill/config.h | 7 ------- keyboards/zvecr/split_blackpill/info.json | 6 ++++++ keyboards/zvecr/zv48/config.h | 7 ------- keyboards/zvecr/zv48/info.json | 6 ++++++ 22 files changed, 70 insertions(+), 81 deletions(-) diff --git a/keyboards/z12/config.h b/keyboards/z12/config.h index 68aff7acf71..33ba6e7467b 100644 --- a/keyboards/z12/config.h +++ b/keyboards/z12/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7A74 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER zigotica -#define PRODUCT z12 - #define ENCODERS_PAD_A { B5, B6 } #define ENCODERS_PAD_B { B4, B2 } diff --git a/keyboards/z12/info.json b/keyboards/z12/info.json index 2395401e471..7aa53d9a5cb 100644 --- a/keyboards/z12/info.json +++ b/keyboards/z12/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "z12", + "manufacturer": "zigotica", "url": "https://github.com/zigotica/mechanical-keyboards/tree/main/z12", "maintainer": "@zigotica", + "usb": { + "vid": "0x7A74", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/z34/config.h b/keyboards/z34/config.h index 71d6528ce80..2b8d37bd0e4 100644 --- a/keyboards/z34/config.h +++ b/keyboards/z34/config.h @@ -18,13 +18,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7A74 -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER zigotica -#define PRODUCT z34 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/z34/info.json b/keyboards/z34/info.json index 4a6dce75254..f28ddf0e1c4 100644 --- a/keyboards/z34/info.json +++ b/keyboards/z34/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "z34", + "manufacturer": "zigotica", "url": "https://github.com/zigotica/mechanical-keyboards/tree/main/z34", "maintainer": "@zigotica", + "usb": { + "vid": "0x7A74", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/zfrontier/big_switch/config.h b/keyboards/zfrontier/big_switch/config.h index ddec2b2796a..e92ad17eb89 100644 --- a/keyboards/zfrontier/big_switch/config.h +++ b/keyboards/zfrontier/big_switch/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 0x0A01 -#define DEVICE_VER 0x0005 -#define MANUFACTURER zFrontier -#define PRODUCT Red Comet Big Switch - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 1 diff --git a/keyboards/zfrontier/big_switch/info.json b/keyboards/zfrontier/big_switch/info.json index c0d542ade13..6467f4c008f 100644 --- a/keyboards/zfrontier/big_switch/info.json +++ b/keyboards/zfrontier/big_switch/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Red Comet Big Switch", + "manufacturer": "zFrontier", "url": "https://en.zfrontier.com/products/redcomet-bigswitch-combo", "maintainer": "carlxia", + "usb": { + "vid": "0xFEED", + "pid": "0x0A01", + "device_version": "0.0.5" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/ziggurat/config.h b/keyboards/ziggurat/config.h index d2332a3e48e..757d46b1209 100644 --- a/keyboards/ziggurat/config.h +++ b/keyboards/ziggurat/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x8F5D -#define PRODUCT_ID 0x5258 -#define DEVICE_VER 0x0001 -#define MANUFACTURER LaminarWoob -#define PRODUCT Ziggurat - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 18 diff --git a/keyboards/ziggurat/info.json b/keyboards/ziggurat/info.json index 77bb288dd66..e1af7f8d88d 100644 --- a/keyboards/ziggurat/info.json +++ b/keyboards/ziggurat/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ziggurat", + "keyboard_name": "Ziggurat", + "manufacturer": "LaminarWoob", "url": "", "maintainer": "kb-elmo", + "usb": { + "vid": "0x8F5D", + "pid": "0x5258", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/zj68/config.h b/keyboards/zj68/config.h index bca9bf72a04..355ad73aeb5 100644 --- a/keyboards/zj68/config.h +++ b/keyboards/zj68/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 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Drop -#define PRODUCT ZJ68 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/zj68/info.json b/keyboards/zj68/info.json index 8495904dc41..ed903a64009 100644 --- a/keyboards/zj68/info.json +++ b/keyboards/zj68/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "ZJ68", + "manufacturer": "Drop", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/zlant/config.h b/keyboards/zlant/config.h index 922c446a016..241f4a51c40 100755 --- a/keyboards/zlant/config.h +++ b/keyboards/zlant/config.h @@ -2,13 +2,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Matthew Cordier -#define PRODUCT Zlant - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 12 diff --git a/keyboards/zlant/info.json b/keyboards/zlant/info.json index 6c58a00defb..69237bdad36 100644 --- a/keyboards/zlant/info.json +++ b/keyboards/zlant/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Zlant", + "manufacturer": "Matthew Cordier", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x6060", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K100", "x":0.25, "y":1}, {"label":"K101", "x":1.25, "y":1}, {"label":"K102", "x":2.25, "y":1}, {"label":"K103", "x":3.25, "y":1}, {"label":"K104", "x":4.25, "y":1}, {"label":"K105", "x":5.25, "y":1}, {"label":"K106", "x":6.25, "y":1}, {"label":"K107", "x":7.25, "y":1}, {"label":"K108", "x":8.25, "y":1}, {"label":"K109", "x":9.25, "y":1}, {"label":"K110", "x":10.25, "y":1}, {"label":"K111", "x":11.25, "y":1}, {"label":"K200", "x":0.5, "y":2}, {"label":"K201", "x":1.5, "y":2}, {"label":"K202", "x":2.5, "y":2}, {"label":"K203", "x":3.5, "y":2}, {"label":"K204", "x":4.5, "y":2}, {"label":"K205", "x":5.5, "y":2}, {"label":"K206", "x":6.5, "y":2}, {"label":"K207", "x":7.5, "y":2}, {"label":"K208", "x":8.5, "y":2}, {"label":"K209", "x":9.5, "y":2}, {"label":"K210", "x":10.5, "y":2}, {"label":"K211", "x":11.5, "y":2}, {"label":"K300", "x":0.75, "y":3}, {"label":"K301", "x":1.75, "y":3}, {"label":"K302", "x":2.75, "y":3}, {"label":"K303", "x":3.75, "y":3}, {"label":"K304", "x":4.75, "y":3}, {"label":"K305", "x":5.75, "y":3}, {"label":"K306", "x":6.75, "y":3}, {"label":"K307", "x":7.75, "y":3}, {"label":"K308", "x":8.75, "y":3}, {"label":"K309", "x":9.75, "y":3}, {"label":"K310", "x":10.75, "y":3}, {"label":"K311", "x":11.75, "y":3}] diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h index 7da55184a09..de2bf34b17c 100644 --- a/keyboards/zoo/wampus/config.h +++ b/keyboards/zoo/wampus/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0200 -#define PRODUCT_ID 0xE600 -#define DEVICE_VER 0x0001 -#define MANUFACTURER zoo.haus -#define PRODUCT Wampus - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/zoo/wampus/info.json b/keyboards/zoo/wampus/info.json index 8125133b1d0..bb74820d411 100644 --- a/keyboards/zoo/wampus/info.json +++ b/keyboards/zoo/wampus/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "zoo.haus Wampus", + "keyboard_name": "Wampus", + "manufacturer": "zoo.haus", "url": "https://zoo.haus", "maintainer": "zoo", + "usb": { + "vid": "0x0200", + "pid": "0xE600", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ diff --git a/keyboards/ztboards/after/config.h b/keyboards/ztboards/after/config.h index d5497dd6d07..9cce8175126 100644 --- a/keyboards/ztboards/after/config.h +++ b/keyboards/ztboards/after/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0927 // ZT Boards -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ZTBoards -#define PRODUCT After - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/ztboards/after/info.json b/keyboards/ztboards/after/info.json index 421450016ad..6081f5c7ccc 100644 --- a/keyboards/ztboards/after/info.json +++ b/keyboards/ztboards/after/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ZTBoards After", + "keyboard_name": "After", + "manufacturer": "ZTBoards", "url": "ztb.mx", "maintainer": "phlopsuh", + "usb": { + "vid": "0x0927", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"Esc", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"|", "x":13, "y":1}, {"label":"`", "x":14, "y":1}, {"label":"Rotary", "x":15.5, "y":0.5}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Del", "x":15.5, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Pg Up", "x":15.5, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14.25, "y":4.25}, {"label":"Pg Dn", "x":15.5, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.5}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13.25, "y":5.25}, {"label":"Down", "x":14.25, "y":5.25}, {"label":"Right", "x":15.25, "y":5.25}] diff --git a/keyboards/ztboards/noon/config.h b/keyboards/ztboards/noon/config.h index 0928665f40e..ead53b1c045 100644 --- a/keyboards/ztboards/noon/config.h +++ b/keyboards/ztboards/noon/config.h @@ -18,13 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x0927 //ZT Boards -#define PRODUCT_ID 0x0002 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ZTBoards -#define PRODUCT Noon - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/ztboards/noon/info.json b/keyboards/ztboards/noon/info.json index fd36892462e..167b8e76adc 100644 --- a/keyboards/ztboards/noon/info.json +++ b/keyboards/ztboards/noon/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "ZTBoards Noon", + "keyboard_name": "Noon", + "manufacturer": "ZTBoards", "url": "ztb.mx", "maintainer": "phlopsuh", + "usb": { + "vid": "0x0927", + "pid": "0x0002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Pg Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Pg Dn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4, "w":7}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h index 75a7ced350d..ec2bbf0f58e 100644 --- a/keyboards/zvecr/split_blackpill/config.h +++ b/keyboards/zvecr/split_blackpill/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5A56 -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0001 -#define MANUFACTURER zvecr -#define PRODUCT split_blackpill - /* key matrix size */ #define MATRIX_ROWS 8 // Rows are doubled-up #define MATRIX_COLS 6 diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json index 0ee144f5f2d..4274e29e086 100644 --- a/keyboards/zvecr/split_blackpill/info.json +++ b/keyboards/zvecr/split_blackpill/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "split_blackpill", + "manufacturer": "zvecr", "url": "", "maintainer": "zvecr", + "usb": { + "vid": "0x5A56", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h index 56be1b27d20..2a993fcd44d 100644 --- a/keyboards/zvecr/zv48/config.h +++ b/keyboards/zvecr/zv48/config.h @@ -17,13 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5A56 -#define PRODUCT_ID 0x0048 -#define DEVICE_VER 0x0001 -#define MANUFACTURER zvecr -#define PRODUCT zv48 - /* key matrix size */ #define MATRIX_ROWS 8 // Rows are doubled-up #define MATRIX_COLS 6 diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json index 5e62a870860..94862b3aee5 100644 --- a/keyboards/zvecr/zv48/info.json +++ b/keyboards/zvecr/zv48/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "zv48", + "manufacturer": "zvecr", "url": "", "maintainer": "zvecr", + "usb": { + "vid": "0x5A56", + "pid": "0x0048", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]