Skip to content

Commit 0e3cc6a

Browse files
authored
Move keyboard USB IDs and strings to data driven: X (#17925)
1 parent 64acbcb commit 0e3cc6a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+218
-245
lines changed

keyboards/x16/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818

1919
#include "config_common.h"
2020

21-
/* USB Device descriptor parameter */
22-
#define VENDOR_ID 0x4B50
23-
#define PRODUCT_ID 0x016A
24-
#define DEVICE_VER 0x0001
25-
#define MANUFACTURER yinxianwei
26-
#define PRODUCT x16
27-
2821
/* key matrix size */
2922
#define MATRIX_ROWS 4
3023
#define MATRIX_COLS 4

keyboards/x16/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "x16",
3+
"manufacturer": "yinxianwei",
34
"url": "",
45
"maintainer": "yinxianwei",
6+
"usb": {
7+
"vid": "0x4B50",
8+
"pid": "0x016A",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT_ortho_4x4": {
713
"layout": [

keyboards/xbows/knight/config.h

-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717

1818
#include "config_common.h"
1919

20-
#define VENDOR_ID 0x5842
21-
#define PRODUCT_ID 0x4B6E
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER X-BOWS
24-
#define PRODUCT KNIGHT
25-
2620
#define MATRIX_ROWS 6
2721
#define MATRIX_COLS 15
2822
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }

keyboards/xbows/knight/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "KNIGHT",
3+
"manufacturer": "X-BOWS",
34
"url": "",
45
"maintainer": "xbows-qmk",
6+
"usb": {
7+
"vid": "0x5842",
8+
"pid": "0x4B6E",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT": {
713
"layout": [

keyboards/xbows/knight_plus/config.h

-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717

1818
#include "config_common.h"
1919

20-
#define VENDOR_ID 0x5842
21-
#define PRODUCT_ID 0x4B50
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER X-BOWS
24-
#define PRODUCT KNIGHT_PLUS
25-
2620
#define MATRIX_ROWS 6
2721
#define MATRIX_COLS 15
2822
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }

keyboards/xbows/knight_plus/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "KNIGHT_PLUS",
3+
"manufacturer": "X-BOWS",
34
"url": "",
45
"maintainer": "xbows-qmk",
6+
"usb": {
7+
"vid": "0x5842",
8+
"pid": "0x4B50",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT": {
713
"layout": [

keyboards/xbows/nature/config.h

-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717

1818
#include "config_common.h"
1919

20-
#define VENDOR_ID 0x5842
21-
#define PRODUCT_ID 0x4E61
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER X-BOWS
24-
#define PRODUCT NATURE
25-
2620
#define MATRIX_ROWS 6
2721
#define MATRIX_COLS 15
2822
#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }

keyboards/xbows/nature/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "NATURE",
3+
"manufacturer": "X-BOWS",
34
"url": "",
45
"maintainer": "xbows-qmk",
6+
"usb": {
7+
"vid": "0x5842",
8+
"pid": "0x4E61",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT": {
713
"layout": [

keyboards/xbows/numpad/config.h

-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717

1818
#include "config_common.h"
1919

20-
#define VENDOR_ID 0x5842
21-
#define PRODUCT_ID 0x4E75
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER X-BOWS
24-
#define PRODUCT NUMPAD
25-
2620
#define MATRIX_ROWS 6
2721
#define MATRIX_COLS 4
2822
#define MATRIX_ROW_PINS { B5, B4, C6, B6, D7, B3 }

keyboards/xbows/numpad/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "NUMPAD",
3+
"manufacturer": "X-BOWS",
34
"url": "",
45
"maintainer": "xbows-qmk",
6+
"usb": {
7+
"vid": "0x5842",
8+
"pid": "0x4E75",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT": {
713
"layout": [

keyboards/xbows/ranger/config.h

-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@
1717

1818
#include "config_common.h"
1919

20-
#define VENDOR_ID 0x5842
21-
#define PRODUCT_ID 0x5261
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER X-BOWS
24-
#define PRODUCT Ranger
25-
2620
#define MATRIX_ROWS 6
2721
#define MATRIX_COLS 16
2822
#define MATRIX_ROW_PINS { C7, B6, B4, C6, B5, D6 }

keyboards/xbows/ranger/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "Ranger",
3+
"manufacturer": "X-BOWS",
34
"url": "",
45
"maintainer": "xbows-qmk",
6+
"usb": {
7+
"vid": "0x5842",
8+
"pid": "0x5261",
9+
"device_version": "0.0.1"
10+
},
511
"layout_aliases": {
612
"LAYOUT": "LAYOUT_tkl_ansi"
713
},

keyboards/xbows/woody/config.h

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
#pragma once
22
#include "config_common.h"
3-
#define VENDOR_ID 0xFEED
4-
#define PRODUCT_ID 0x1224
5-
#define DEVICE_VER 0x0001
6-
#define MANUFACTURER X-BOWS
7-
#define PRODUCT WOO-DY
83

94
#define MATRIX_ROWS 5
105
#define MATRIX_COLS 15

keyboards/xbows/woody/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "WOO-DY",
3+
"manufacturer": "X-BOWS",
34
"url": "",
45
"maintainer": "qmk",
6+
"usb": {
7+
"vid": "0xFEED",
8+
"pid": "0x1224",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT": {
713
"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":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":6.25}, {"x":10.25, "y":4, "w":1.5}, {"x":11.75, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]

keyboards/xelus/akis/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818

1919
#include "config_common.h"
2020

21-
// USB Device descriptor parameter
22-
#define VENDOR_ID 0x5845 // XE
23-
#define PRODUCT_ID 0xA04B // A-K
24-
#define DEVICE_VER 0x0001
25-
#define MANUFACTURER Xelus
26-
#define PRODUCT AkiS
27-
2821
/* key matrix size */
2922
#define MATRIX_ROWS 5
3023
#define MATRIX_COLS 15

keyboards/xelus/akis/info.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
2-
"keyboard_name": "akiS",
2+
"keyboard_name": "AkiS",
3+
"manufacturer": "Xelus",
34
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/akis",
45
"maintainer": "Xelus22",
6+
"usb": {
7+
"vid": "0x5845",
8+
"pid": "0xA04B",
9+
"device_version": "0.0.1"
10+
},
511
"layout_aliases": {
612
"LAYOUT_65_all": "LAYOUT_all"
713
},

keyboards/xelus/dharma/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
#pragma once
1818

19-
/* USB Device descriptor parameter */
20-
#define VENDOR_ID 0x5845 // XE
21-
#define PRODUCT_ID 0xDAAA // Dharma
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER Xelus
24-
#define PRODUCT Dharma
25-
2619
/* key matrix size */
2720
#define MATRIX_ROWS 5
2821
#define MATRIX_COLS 18

keyboards/xelus/dharma/info.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
2-
"keyboard_name": "Xelus Dharma",
2+
"keyboard_name": "Dharma",
3+
"manufacturer": "Xelus",
34
"url": "",
45
"maintainer": "Xelus22",
6+
"usb": {
7+
"vid": "0x5845",
8+
"pid": "0xDAAA",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT_all": {
713
"layout": [

keyboards/xelus/kangaroo/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
#pragma once
1818

19-
/* USB Device descriptor parameter */
20-
#define VENDOR_ID 0x5845 // XE
21-
#define PRODUCT_ID 0x524F // RO
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER Xelus
24-
#define PRODUCT Kangaroo
25-
2619
/* key matrix size */
2720
#define MATRIX_ROWS 12
2821
#define MATRIX_COLS 11

keyboards/xelus/kangaroo/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "Kangaroo",
3+
"manufacturer": "Xelus",
34
"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/kangaroo",
45
"maintainer": "qmk",
6+
"usb": {
7+
"vid": "0x5845",
8+
"pid": "0x524F",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT_all": {
713
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"label":"PrtSc", "x":4.25, "y":0}, {"label":"Scroll Lock", "x":5.25, "y":0}, {"label":"Pause", "x":6.25, "y":0}, {"label":"Esc", "x":7.5, "y":0}, {"label":"F1", "x":9.5, "y":0}, {"label":"F2", "x":10.5, "y":0}, {"label":"F3", "x":11.5, "y":0}, {"label":"F4", "x":12.5, "y":0}, {"label":"F5", "x":14, "y":0}, {"label":"F6", "x":15, "y":0}, {"label":"F7", "x":16, "y":0}, {"label":"F8", "x":17, "y":0}, {"label":"F9", "x":18.5, "y":0}, {"label":"F10", "x":19.5, "y":0}, {"label":"F11", "x":20.5, "y":0}, {"label":"F12", "x":21.5, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"label":"Insert", "x":4.25, "y":1.25}, {"label":"Home", "x":5.25, "y":1.25}, {"label":"PgUp", "x":6.25, "y":1.25}, {"label":"~", "x":7.5, "y":1.25}, {"label":"!", "x":8.5, "y":1.25}, {"label":"@", "x":9.5, "y":1.25}, {"label":"#", "x":10.5, "y":1.25}, {"label":"$", "x":11.5, "y":1.25}, {"label":"%", "x":12.5, "y":1.25}, {"label":"^", "x":13.5, "y":1.25}, {"label":"&", "x":14.5, "y":1.25}, {"label":"*", "x":15.5, "y":1.25}, {"label":"(", "x":16.5, "y":1.25}, {"label":")", "x":17.5, "y":1.25}, {"label":"_", "x":18.5, "y":1.25}, {"label":"+", "x":19.5, "y":1.25}, {"x":20.5, "y":1.25}, {"x":21.5, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"label":"Delete", "x":4.25, "y":2.25}, {"label":"End", "x":5.25, "y":2.25}, {"label":"PgDn", "x":6.25, "y":2.25}, {"label":"Tab", "x":7.5, "y":2.25, "w":1.5}, {"label":"Q", "x":9, "y":2.25}, {"label":"W", "x":10, "y":2.25}, {"label":"E", "x":11, "y":2.25}, {"label":"R", "x":12, "y":2.25}, {"label":"T", "x":13, "y":2.25}, {"label":"Y", "x":14, "y":2.25}, {"label":"U", "x":15, "y":2.25}, {"label":"I", "x":16, "y":2.25}, {"label":"O", "x":17, "y":2.25}, {"label":"P", "x":18, "y":2.25}, {"label":"{", "x":19, "y":2.25}, {"label":"}", "x":20, "y":2.25}, {"label":"|", "x":21, "y":2.25, "w":1.5}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"label":"Caps Lock", "x":7.5, "y":3.25, "w":1.75}, {"label":"A", "x":9.25, "y":3.25}, {"label":"S", "x":10.25, "y":3.25}, {"label":"D", "x":11.25, "y":3.25}, {"label":"F", "x":12.25, "y":3.25}, {"label":"G", "x":13.25, "y":3.25}, {"label":"H", "x":14.25, "y":3.25}, {"label":"J", "x":15.25, "y":3.25}, {"label":"K", "x":16.25, "y":3.25}, {"label":"L", "x":17.25, "y":3.25}, {"label":":", "x":18.25, "y":3.25}, {"label":"\"", "x":19.25, "y":3.25}, {"label":"Enter", "x":20.25, "y":3.25, "w":2.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"label":"\u2191", "x":5.25, "y":4.25}, {"label":"Shift", "x":7.5, "y":4.25, "w":2.25}, {"label":"Z", "x":9.75, "y":4.25}, {"label":"X", "x":10.75, "y":4.25}, {"label":"C", "x":11.75, "y":4.25}, {"label":"V", "x":12.75, "y":4.25}, {"label":"B", "x":13.75, "y":4.25}, {"label":"N", "x":14.75, "y":4.25}, {"label":"M", "x":15.75, "y":4.25}, {"label":"<", "x":16.75, "y":4.25}, {"label":">", "x":17.75, "y":4.25}, {"label":"?", "x":18.75, "y":4.25}, {"x":19.75, "y":4.25, "w":1.75}, {"x":21.5, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"label":"\u2190", "x":4.25, "y":5.25}, {"label":"\u2193", "x":5.25, "y":5.25}, {"label":"\u2192", "x":6.25, "y":5.25}, {"label":"Ctrl", "x":7.5, "y":5.25, "w":1.25}, {"label":"Win", "x":8.75, "y":5.25, "w":1.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":6.25}, {"label":"Alt", "x":17.5, "y":5.25, "w":1.25}, {"label":"Win", "x":18.75, "y":5.25, "w":1.25}, {"label":"Menu", "x":20, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":21.25, "y":5.25, "w":1.25}]

keyboards/xelus/la_plus/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@
1818

1919
#include "config_common.h"
2020

21-
/* USB Device descriptor parameter */
22-
#define VENDOR_ID 0x5845 // XE
23-
#define PRODUCT_ID 0x4C50 // LP
24-
#define DEVICE_VER 0x0001
25-
#define MANUFACTURER Xelus
26-
#define PRODUCT MechaMaker La+
27-
2821
/* key matrix size */
2922
#define MATRIX_ROWS 5
3023
#define MATRIX_COLS 15

keyboards/xelus/la_plus/info.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
2-
"keyboard_name": "La+",
2+
"keyboard_name": "MechaMaker La+",
3+
"manufacturer": "Xelus",
34
"url": "",
45
"maintainer": "Xelus22",
6+
"usb": {
7+
"vid": "0x5845",
8+
"pid": "0x4C50",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT_all": {
713
"layout": [

keyboards/xelus/ninjin/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
#pragma once
1818

19-
/* USB Device descriptor parameter */
20-
#define VENDOR_ID 0x5845 // XE
21-
#define PRODUCT_ID 0x4E4A // NJ
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER Xelus
24-
#define PRODUCT Ninjin
25-
2619
/* key matrix size */
2720
#define MATRIX_ROWS 6
2821
#define MATRIX_COLS 17

keyboards/xelus/ninjin/info.json

+6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
22
"keyboard_name": "Ninjin",
3+
"manufacturer": "Xelus",
34
"url": "",
45
"maintainer": "Xelus",
6+
"usb": {
7+
"vid": "0x5845",
8+
"pid": "0x4E4A",
9+
"device_version": "0.0.1"
10+
},
511
"layout_aliases": {
612
"LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
713
},

keyboards/xelus/pachi/mini_32u4/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
#pragma once
1818

19-
/* USB Device descriptor parameter */
20-
#define VENDOR_ID 0x5845 // XE
21-
#define PRODUCT_ID 0x5041 // PA
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER Xelus
24-
#define PRODUCT Xelus Pachi Mini
25-
2619
/* key matrix size */
2720
#define MATRIX_ROWS 6
2821
#define MATRIX_COLS 17

keyboards/xelus/pachi/mini_32u4/info.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
2-
"keyboard_name": "Xelus Pachi Mini",
2+
"keyboard_name": "Pachi Mini",
3+
"manufacturer": "Xelus",
34
"url": "",
45
"maintainer": "Xelus22",
6+
"usb": {
7+
"vid": "0x5845",
8+
"pid": "0x5041",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT_all": {
713
"layout": [

keyboards/xelus/pachi/rev1/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616

1717
#pragma once
1818

19-
/* USB Device descriptor parameter */
20-
#define VENDOR_ID 0x5845 // XE
21-
#define PRODUCT_ID 0x5041 // PA
22-
#define DEVICE_VER 0x0001
23-
#define MANUFACTURER Xelus
24-
#define PRODUCT Xelus Pachi
25-
2619
/* key matrix size */
2720
#define MATRIX_ROWS 6
2821
#define MATRIX_COLS 17

keyboards/xelus/pachi/rev1/info.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
2-
"keyboard_name": "Xelus Pachi Rev 1",
2+
"keyboard_name": "Pachi Rev 1",
3+
"manufacturer": "Xelus",
34
"url": "",
45
"maintainer": "Xelus22",
6+
"usb": {
7+
"vid": "0x5845",
8+
"pid": "0x5041",
9+
"device_version": "0.0.1"
10+
},
511
"layouts": {
612
"LAYOUT_all": {
713
"layout": [

0 commit comments

Comments
 (0)