summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-07-28 05:19:09 +1000
committerGitHub <noreply@github.com>2022-07-27 20:19:09 +0100
commit4a0eb733acf2efb66473046f174ad695f746ab24 (patch)
tree8662d104890776533554f8b91ad569b66bbbb581 /keyboards
parentc788857b6bfc150defce4579a9e946e5744f0d5a (diff)
Move keyboard USB IDs and strings to data driven: G (#17818)
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/gami_studio/lex60/config.h7
-rw-r--r--keyboards/gami_studio/lex60/info.json8
-rw-r--r--keyboards/gboards/butterstick/config.h6
-rw-r--r--keyboards/gboards/butterstick/info.json6
-rw-r--r--keyboards/gboards/ergotaco/config.h7
-rw-r--r--keyboards/gboards/ergotaco/info.json6
-rw-r--r--keyboards/gboards/georgi/config.h7
-rw-r--r--keyboards/gboards/georgi/info.json6
-rw-r--r--keyboards/gboards/gergo/config.h7
-rw-r--r--keyboards/gboards/gergo/info.json8
-rw-r--r--keyboards/gboards/gergoplex/config.h7
-rw-r--r--keyboards/gboards/gergoplex/info.json6
-rw-r--r--keyboards/geekboards/macropad_v2/config.h7
-rw-r--r--keyboards/geekboards/macropad_v2/info.json8
-rw-r--r--keyboards/geekboards/tester/config.h8
-rw-r--r--keyboards/geekboards/tester/info.json8
-rw-r--r--keyboards/generic_panda/panda65_01/config.h7
-rw-r--r--keyboards/generic_panda/panda65_01/info.json6
-rw-r--r--keyboards/genone/eclipse_65/config.h7
-rw-r--r--keyboards/genone/eclipse_65/info.json8
-rw-r--r--keyboards/genone/g1_65/config.h7
-rw-r--r--keyboards/genone/g1_65/info.json6
-rw-r--r--keyboards/gentleman65/config.h7
-rw-r--r--keyboards/gentleman65/info.json8
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/config.h7
-rw-r--r--keyboards/ggkeyboards/genesis/hotswap/info.json6
-rw-r--r--keyboards/ggkeyboards/genesis/solder/config.h7
-rw-r--r--keyboards/ggkeyboards/genesis/solder/info.json6
-rw-r--r--keyboards/gh60/revc/config.h7
-rw-r--r--keyboards/gh60/revc/info.json6
-rw-r--r--keyboards/gh60/satan/config.h7
-rw-r--r--keyboards/gh60/satan/info.json6
-rw-r--r--keyboards/gh60/v1p3/config.h7
-rw-r--r--keyboards/gh60/v1p3/info.json6
-rw-r--r--keyboards/gh80_3000/config.h7
-rw-r--r--keyboards/gh80_3000/info.json6
-rw-r--r--keyboards/ghs/rar/config.h7
-rw-r--r--keyboards/ghs/rar/info.json6
-rwxr-xr-xkeyboards/gizmo_engineering/gk6/config.h7
-rwxr-xr-xkeyboards/gizmo_engineering/gk6/info.json8
-rw-r--r--keyboards/gkeyboard/gkb_m16/config.h6
-rw-r--r--keyboards/gkeyboard/gkb_m16/info.json8
-rw-r--r--keyboards/gl516/a52gl/config.h7
-rw-r--r--keyboards/gl516/a52gl/info.json6
-rw-r--r--keyboards/gl516/j73gl/config.h7
-rw-r--r--keyboards/gl516/j73gl/info.json6
-rw-r--r--keyboards/gl516/n51gl/config.h7
-rw-r--r--keyboards/gl516/n51gl/info.json6
-rw-r--r--keyboards/glenpickle/chimera_ergo/config.h8
-rw-r--r--keyboards/glenpickle/chimera_ergo/info.json6
-rw-r--r--keyboards/glenpickle/chimera_ls/config.h8
-rw-r--r--keyboards/glenpickle/chimera_ls/info.json8
-rw-r--r--keyboards/glenpickle/chimera_ortho/config.h8
-rw-r--r--keyboards/glenpickle/chimera_ortho/info.json6
-rw-r--r--keyboards/glenpickle/chimera_ortho_plus/config.h8
-rw-r--r--keyboards/glenpickle/chimera_ortho_plus/info.json6
-rw-r--r--keyboards/gon/nerd60/config.h7
-rw-r--r--keyboards/gon/nerd60/info.json8
-rw-r--r--keyboards/gon/nerdtkl/config.h7
-rw-r--r--keyboards/gon/nerdtkl/info.json8
-rw-r--r--keyboards/gopolar/gg86/config.h7
-rw-r--r--keyboards/gopolar/gg86/info.json8
-rw-r--r--keyboards/gorthage_truck/config.h7
-rw-r--r--keyboards/gorthage_truck/info.json6
-rw-r--r--keyboards/gowla/config.h7
-rw-r--r--keyboards/gowla/info.json8
-rw-r--r--keyboards/gray_studio/apollo80/config.h7
-rw-r--r--keyboards/gray_studio/apollo80/info.json8
-rw-r--r--keyboards/gray_studio/cod67/config.h7
-rw-r--r--keyboards/gray_studio/cod67/info.json6
-rw-r--r--keyboards/gray_studio/hb85/config.h6
-rw-r--r--keyboards/gray_studio/hb85/info.json8
-rw-r--r--keyboards/gray_studio/space65/config.h7
-rw-r--r--keyboards/gray_studio/space65/info.json8
-rw-r--r--keyboards/gray_studio/think65/hotswap/config.h7
-rw-r--r--keyboards/gray_studio/think65/hotswap/info.json8
-rw-r--r--keyboards/gray_studio/think65/solder/config.h7
-rw-r--r--keyboards/gray_studio/think65/solder/info.json8
-rw-r--r--keyboards/grid600/press/config.h7
-rw-r--r--keyboards/grid600/press/info.json8
-rw-r--r--keyboards/gvalchca/ga150/config.h7
-rw-r--r--keyboards/gvalchca/ga150/info.json6
-rw-r--r--keyboards/gvalchca/spaccboard/config.h7
-rw-r--r--keyboards/gvalchca/spaccboard/info.json6
84 files changed, 271 insertions, 315 deletions
diff --git a/keyboards/gami_studio/lex60/config.h b/keyboards/gami_studio/lex60/config.h
index d19ecd78a0..311f355589 100644
--- a/keyboards/gami_studio/lex60/config.h
+++ b/keyboards/gami_studio/lex60/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 0x7353
-#define PRODUCT_ID 0x0160
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Evyd13
-#define PRODUCT Lex60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json
index b8535c7fd9..7422287bd6 100644
--- a/keyboards/gami_studio/lex60/info.json
+++ b/keyboards/gami_studio/lex60/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Gami Studio Lex60",
+ "keyboard_name": "Lex60",
+ "manufacturer": "Evyd13",
"url": "",
"maintainer": "GamiStudio",
+ "usb": {
+ "vid": "0x7353",
+ "pid": "0x0160",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/gboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
index 69632cd4f7..84e1899081 100644
--- a/keyboards/gboards/butterstick/config.h
+++ b/keyboards/gboards/butterstick/config.h
@@ -2,12 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1337
-#define DEVICE_VER 0x0001
-#define MANUFACTURER g Heavy Industries
-#define PRODUCT Butter Stick
#define VERSION "Paula Deen"
#define DEBOUNCE 5
diff --git a/keyboards/gboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
index 6bfd58e594..158769dbd1 100644
--- a/keyboards/gboards/butterstick/info.json
+++ b/keyboards/gboards/butterstick/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Butter Stick",
+ "manufacturer": "g Heavy Industries",
"url": "",
"maintainer": "germ",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1337",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_butter": {
"layout": [
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index d415e77dc6..21d14144d9 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VERBOSE
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1337
-#define DEVICE_VER 0x0001
-#define MANUFACTURER g Heavy Industries
-#define PRODUCT ErgoTaco
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
diff --git a/keyboards/gboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index e7794e6ee3..bd1863288e 100644
--- a/keyboards/gboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "ErgoTaco",
+ "manufacturer": "g Heavy Industries",
"url": "http://gboards.ca",
"maintainer": "germ",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1337",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index f2e73da899..e3da59a781 100644
--- a/keyboards/gboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
@@ -30,13 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define NO_ACTION_ONESHOT
#define IGNORE_MOD_TAP_INTERRUPT
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1337
-#define DEVICE_VER 0x0001
-#define MANUFACTURER g Heavy Industries
-#define PRODUCT Georgi
-
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json
index 213b14f352..0bfe2a52aa 100644
--- a/keyboards/gboards/georgi/info.json
+++ b/keyboards/gboards/georgi/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Georgi",
+ "manufacturer": "g Heavy Industries",
"url": "http://gboards.ca",
"maintainer": "germ",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1337",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_georgi": {
"layout": [
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index 9d56c0e24f..1308312950 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
@@ -35,13 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VERBOSE
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1307
-#define DEVICE_VER 0x0001
-#define MANUFACTURER g Heavy Industries
-#define PRODUCT Gergo
-
/* key matrix size */
#define MATRIX_ROWS 14
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index be52e49046..e3f8b1caff 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
@@ -1,7 +1,13 @@
{
- "maintainer": "germ",
"keyboard_name": "Gergo",
+ "manufacturer": "g Heavy Industries",
"url": "http://gboards.ca",
+ "maintainer": "germ",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1307",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_gergo": {
"layout": [
diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h
index 6a73ccc4ea..f118bb4017 100644
--- a/keyboards/gboards/gergoplex/config.h
+++ b/keyboards/gboards/gergoplex/config.h
@@ -21,13 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x6B0A
-#define PRODUCT_ID 0x0002
-#define DEVICE_VER 0x0001
-#define MANUFACTURER g Heavy Industries
-#define PRODUCT GergoPlex
-
/* key matrix size */
#define MATRIX_ROWS 10
#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
index 5aa696d5de..462c2434a3 100644
--- a/keyboards/gboards/gergoplex/info.json
+++ b/keyboards/gboards/gergoplex/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "GergoPlex",
+ "manufacturer": "g Heavy Industries",
"url": "",
"maintainer": "germ",
+ "usb": {
+ "vid": "0x6B0A",
+ "pid": "0x0002",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index cb671bfab7..69c87cd154 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -15,13 +15,6 @@
*/
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x0483
-#define PRODUCT_ID 0xA372
-#define DEVICE_VER 0x0002
-#define MANUFACTURER GeekBoards
-#define PRODUCT Macropad v2
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 4
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index 770ebbb0f4..b62620af9b 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "macropad_v2",
+ "keyboard_name": "Macropad v2",
+ "manufacturer": "GeebBoards",
"url": "https://geekboards.ru/",
"maintainer": "ruddy17",
+ "usb": {
+ "vid": "0x0483",
+ "pid": "0xA372",
+ "device_version": "0.0.2"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index ac3b95c7e7..47cb82f215 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -2,14 +2,6 @@
#include "config_common.h"
-
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x1319
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Geekboards
-#define PRODUCT Geekboards Tester
-
-
#define MATRIX_ROWS 2
#define MATRIX_COLS 4
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index 9882aa6850..2da610fb3f 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Geekboards 8-keys macropad",
+ "keyboard_name": "Tester",
+ "manufacturer": "Geekboards",
"url": "",
"maintainer": "moyi4681",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x1319",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/generic_panda/panda65_01/config.h b/keyboards/generic_panda/panda65_01/config.h
index 9d4f0c19b4..41cf77a389 100644
--- a/keyboards/generic_panda/panda65_01/config.h
+++ b/keyboards/generic_panda/panda65_01/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 0x6770 // gp generic_panda
-#define PRODUCT_ID 0x6501 // 65_01
-#define DEVICE_VER 0x0001
-#define MANUFACTURER generic_panda
-#define PRODUCT panda65_01
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/generic_panda/panda65_01/info.json b/keyboards/generic_panda/panda65_01/info.json
index a2ad377615..83daae6631 100644
--- a/keyboards/generic_panda/panda65_01/info.json
+++ b/keyboards/generic_panda/panda65_01/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Panda65_01",
+ "manufacturer": "generic_panda",
"url": "https://github.com/JesseLeung97/qmk_firmware/tree/master/keyboards/generic_panda/panda65_01",
"maintainer": "generic_panda",
+ "usb": {
+ "vid": "0x6770",
+ "pid": "0x6501",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_split_bs": {
"layout": [{"label":"Esc", "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":"Del", "x":14, "y":0}, {"label":"Home", "x":15, "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":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"PGup", "x":15, "y":1}, {"label":"Caps", "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":"PgDn", "x":15, "y":2}, {"label":"LShift", "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":"RShift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"FN", "x":15, "y":3}, {"label":"LControl", "x":0, "y":4, "w":1.5}, {"label":"LAlt", "x":2.25, "y":4, "w":1.5}, {"label":"Space", "x":3.75, "y":4, "w":7}, {"label":"RWin", "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/genone/eclipse_65/config.h b/keyboards/genone/eclipse_65/config.h
index e9869e3694..c13f04ad29 100644
--- a/keyboar