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/xiudi | |
parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/xiudi')
-rw-r--r-- | keyboards/xiudi/xd004/info.json | 6 | ||||
-rw-r--r-- | keyboards/xiudi/xd004/v1/config.h | 8 | ||||
-rw-r--r-- | keyboards/xiudi/xd60/info.json | 6 | ||||
-rw-r--r-- | keyboards/xiudi/xd60/rev2/config.h | 7 | ||||
-rw-r--r-- | keyboards/xiudi/xd60/rev2/info.json | 6 | ||||
-rw-r--r-- | keyboards/xiudi/xd60/rev3/config.h | 7 | ||||
-rw-r--r-- | keyboards/xiudi/xd60/rev3/info.json | 6 |
7 files changed, 23 insertions, 23 deletions
diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index 26e418943f..e9876f8c64 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -1,6 +1,12 @@ { "keyboard_name": "XD004", + "manufacturer": "XIUDI", "maintainer": "qmk", + "usb": { + "vid": "0x7844", + "pid": "0x0404", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"L", "x":0, "y":0}, {"label":"O", "x":1, "y":0}, {"label":"V", "x":2, "y":0}, {"label":"E", "x":3, "y":0}] diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h index 559699e159..b2e36f4704 100644 --- a/keyboards/xiudi/xd004/v1/config.h +++ b/keyboards/xiudi/xd004/v1/config.h @@ -25,14 +25,6 @@ where some things are disabled to save space as well. #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7844 // "XD" -#define PRODUCT_ID 0x0404 -#define DEVICE_VER 0x0001 -// Note: unsure about manufacturer -#define MANUFACTURER XIUDI -#define PRODUCT XD004 v1 - /* key matrix size */ #define MATRIX_ROWS 1 #define MATRIX_COLS 4 diff --git a/keyboards/xiudi/xd60/info.json b/keyboards/xiudi/xd60/info.json index 8ea3d6a4ff..04e863a3bc 100644 --- a/keyboards/xiudi/xd60/info.json +++ b/keyboards/xiudi/xd60/info.json @@ -1,6 +1,10 @@ { - "keyboard_name": "XD60", + "manufacturer": "XIUDI", "maintainer": "qmk", + "usb": { + "vid": "0x7844", + "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}, {"x":13, "y":0}, {"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":"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}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3}, {"x":1, "y":3}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"label":"Menu", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"x":14, "y":4}] diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h index d5bfc89a2d..d5e8642e59 100644 --- a/keyboards/xiudi/xd60/rev2/config.h +++ b/keyboards/xiudi/xd60/rev2/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 0x7844 // "XD" -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER XIUDI -#define PRODUCT XD60v2 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json new file mode 100644 index 0000000000..bceb5bc6cb --- /dev/null +++ b/keyboards/xiudi/xd60/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "XD60 Rev 2", + "usb": { + "pid": "0x6060" + } +} diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h index 189b0222b0..243630c76b 100644 --- a/keyboards/xiudi/xd60/rev3/config.h +++ b/keyboards/xiudi/xd60/rev3/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 0x7844 // "XD" -#define PRODUCT_ID 0x6363 -#define DEVICE_VER 0x0001 -#define MANUFACTURER XIUDI -#define PRODUCT XD60rev3 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json new file mode 100644 index 0000000000..a03a344a28 --- /dev/null +++ b/keyboards/xiudi/xd60/rev3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "XD60 Rev 3", + "usb": { + "pid": "0x6363" + } +} |