summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-28 13:13:39 +0000
committerQMK Bot <hello@qmk.fm>2022-07-28 13:13:39 +0000
commitc2f68e32321f733a07ebf7b8dc9ddf9c45b759ab (patch)
treea8c704adbbbe8237aa62616120d0f1bbf37e2b9a /keyboards
parent157ea964117de382b52229db87a55340830839c9 (diff)
parent920f9837677749541b88b02ecb245539943140e2 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/h0oni/deskpad/config.h7
-rw-r--r--keyboards/h0oni/deskpad/info.json6
-rw-r--r--keyboards/h0oni/hotduck/config.h7
-rw-r--r--keyboards/h0oni/hotduck/info.json6
-rw-r--r--keyboards/halfcliff/config.h7
-rw-r--r--keyboards/halfcliff/info.json6
-rw-r--r--keyboards/halokeys/elemental75/config.h8
-rw-r--r--keyboards/halokeys/elemental75/info.json8
-rw-r--r--keyboards/han60/config.h7
-rw-r--r--keyboards/han60/info.json6
-rwxr-xr-xkeyboards/hand88/config.h7
-rwxr-xr-xkeyboards/hand88/info.json6
-rw-r--r--keyboards/hardlineworks/otd_plus/config.h7
-rw-r--r--keyboards/hardlineworks/otd_plus/info.json6
-rw-r--r--keyboards/heliar/wm1_hotswap/config.h7
-rw-r--r--keyboards/heliar/wm1_hotswap/info.json8
-rw-r--r--keyboards/helix/pico/config.h7
-rw-r--r--keyboards/helix/pico/info.json6
-rw-r--r--keyboards/helix/rev2/config.h7
-rw-r--r--keyboards/helix/rev2/info.json8
-rw-r--r--keyboards/helix/rev3_4rows/config.h7
-rw-r--r--keyboards/helix/rev3_4rows/info.json6
-rw-r--r--keyboards/helix/rev3_5rows/config.h7
-rw-r--r--keyboards/helix/rev3_5rows/info.json6
-rw-r--r--keyboards/hhkb/ansi/config.h7
-rw-r--r--keyboards/hhkb/ansi/info.json8
-rw-r--r--keyboards/hhkb/jp/config.h7
-rw-r--r--keyboards/hhkb/jp/info.json8
-rw-r--r--keyboards/hhkb/yang/config.h7
-rw-r--r--keyboards/hhkb/yang/info.json8
-rw-r--r--keyboards/hhkb_lite_2/config.h7
-rw-r--r--keyboards/hhkb_lite_2/info.json6
-rw-r--r--keyboards/hidtech/bastyl/config.h5
-rw-r--r--keyboards/hidtech/bastyl/info.json6
-rw-r--r--keyboards/hifumi/config.h7
-rw-r--r--keyboards/hifumi/info.json6
-rw-r--r--keyboards/hineybush/h08_ocelot/config.h7
-rw-r--r--keyboards/hineybush/h08_ocelot/info.json6
-rw-r--r--keyboards/hineybush/h10/config.h7
-rw-r--r--keyboards/hineybush/h10/info.json6
-rw-r--r--keyboards/hineybush/h60/config.h7
-rw-r--r--keyboards/hineybush/h60/info.json6
-rw-r--r--keyboards/hineybush/h65/config.h7
-rw-r--r--keyboards/hineybush/h65/info.json6
-rw-r--r--keyboards/hineybush/h65_hotswap/config.h7
-rw-r--r--keyboards/hineybush/h65_hotswap/info.json6
-rw-r--r--keyboards/hineybush/h660s/config.h7
-rw-r--r--keyboards/hineybush/h660s/info.json8
-rw-r--r--keyboards/hineybush/h75_singa/config.h7
-rw-r--r--keyboards/hineybush/h75_singa/info.json6
-rw-r--r--keyboards/hineybush/h87a/config.h7
-rw-r--r--keyboards/hineybush/h87a/info.json6
-rw-r--r--keyboards/hineybush/h88/config.h9
-rw-r--r--keyboards/hineybush/h88/info.json8
-rw-r--r--keyboards/hineybush/hbcp/config.h7
-rw-r--r--keyboards/hineybush/hbcp/info.json6
-rw-r--r--keyboards/hineybush/hineyg80/config.h7
-rw-r--r--keyboards/hineybush/hineyg80/info.json8
-rw-r--r--keyboards/hineybush/physix/config.h7
-rw-r--r--keyboards/hineybush/physix/info.json8
-rw-r--r--keyboards/hineybush/sm68/config.h7
-rw-r--r--keyboards/hineybush/sm68/info.json6
-rw-r--r--keyboards/hnahkb/freyr/config.h7
-rw-r--r--keyboards/hnahkb/freyr/info.json8
-rw-r--r--keyboards/hnahkb/stella/config.h7
-rw-r--r--keyboards/hnahkb/stella/info.json6
-rw-r--r--keyboards/hnahkb/vn66/config.h7
-rw-r--r--keyboards/hnahkb/vn66/info.json8
-rw-r--r--keyboards/holyswitch/southpaw75/config.h7
-rw-r--r--keyboards/holyswitch/southpaw75/info.json8
-rw-r--r--keyboards/horizon/config.h7
-rw-r--r--keyboards/horizon/info.json6
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/config.h7
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/info.json8
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/config.h7
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/info.json6
-rw-r--r--keyboards/horrortroll/handwired_k552/config.h7
-rw-r--r--keyboards/horrortroll/handwired_k552/info.json8
-rw-r--r--keyboards/horrortroll/lemon40/config.h7
-rw-r--r--keyboards/horrortroll/lemon40/info.json6
-rw-r--r--keyboards/horrortroll/paws60/config.h7
-rw-r--r--keyboards/horrortroll/paws60/info.json6
-rw-r--r--keyboards/hotdox/config.h9
-rw-r--r--keyboards/hotdox/info.json8
-rw-r--r--keyboards/hp69/config.h7
-rw-r--r--keyboards/hp69/info.json6
-rw-r--r--keyboards/hs60/v1/config.h7
-rw-r--r--keyboards/hs60/v1/info.json6
-rw-r--r--keyboards/hs60/v2/ansi/config.h7
-rw-r--r--keyboards/hs60/v2/ansi/info.json10
-rw-r--r--keyboards/hs60/v2/hhkb/config.h7
-rw-r--r--keyboards/hs60/v2/hhkb/info.json10
-rw-r--r--keyboards/hs60/v2/iso/config.h7
-rw-r--r--keyboards/hs60/v2/iso/info.json10
-rwxr-xr-xkeyboards/hub16/config.h7
-rw-r--r--keyboards/hub16/info.json6
-rw-r--r--keyboards/hub20/config.h7
-rw-r--r--keyboards/hub20/info.json6
98 files changed, 316 insertions, 368 deletions
diff --git a/keyboards/h0oni/deskpad/config.h b/keyboards/h0oni/deskpad/config.h
index c5c8054ca1..d01487a5f7 100644
--- a/keyboards/h0oni/deskpad/config.h
+++ b/keyboards/h0oni/deskpad/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4D53
-#define PRODUCT_ID 0x4450 //hD
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Hydrogen
-#define PRODUCT Deskpad
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/info.json
index b5622d578f..d02a5b0012 100644
--- a/keyboards/h0oni/deskpad/info.json
+++ b/keyboards/h0oni/deskpad/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Deskpad",
+ "manufacturer": "Hydrogen",
"url": "",
"maintainer": "Hydrogen BD",
+ "usb": {
+ "vid": "0x4D53",
+ "pid": "0x4450",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [{"label":"k1", "x":0, "y":0},
diff --git a/keyboards/h0oni/hotduck/config.h b/keyboards/h0oni/hotduck/config.h
index 9865f5d303..5ee44e4e23 100644
--- a/keyboards/h0oni/hotduck/config.h
+++ b/keyboards/h0oni/hotduck/config.h
@@ -18,13 +18,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4D53
-#define PRODUCT_ID 0x6844 //hD
-#define DEVICE_VER 0x0001
-#define MANUFACTURER h0oni
-#define PRODUCT hotDuck
-
/* key matrix size */
#define MATRIX_ROWS 7
#define MATRIX_COLS 10
diff --git a/keyboards/h0oni/hotduck/info.json b/keyboards/h0oni/hotduck/info.json
index 32e4ae7c2f..29f6471600 100644
--- a/keyboards/h0oni/hotduck/info.json
+++ b/keyboards/h0oni/hotduck/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "hotDuck",
+ "manufacturer": "h0oni",
"url": "",
"maintainer": "h0oni",
+ "usb": {
+ "vid": "0x4D53",
+ "pid": "0x6844",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [{"label":"Esc", "x":0, "y":0},
diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
index 9cd03089ba..0ef616b967 100644
--- a/keyboards/halfcliff/config.h
+++ b/keyboards/halfcliff/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 0x0335
-#define PRODUCT_ID 0x0021
-#define DEVICE_VER 0x0001
-#define MANUFACTURER n2
-#define PRODUCT halfcliff
-
/* key matrix size */
#define MATRIX_ROWS 20
#define MATRIX_COLS 5
diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json
index d5b5d4e53f..fa189c1056 100644
--- a/keyboards/halfcliff/info.json
+++ b/keyboards/halfcliff/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "halfcliff",
+ "manufacturer": "n2",
"url": "https://github.com/N2-Sumikko",
"maintainer": "n2",
+ "usb": {
+ "vid": "0x0335",
+ "pid": "0x0021",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/halokeys/elemental75/config.h b/keyboards/halokeys/elemental75/config.h
index f5f6a95380..bdc70b7a42 100644
--- a/keyboards/halokeys/elemental75/config.h
+++ b/keyboards/halokeys/elemental75/config.h
@@ -16,14 +16,6 @@
#pragma once
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xEA0B
-#define PRODUCT_ID 0xEA75
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Halokeys
-#define PRODUCT Elemental75
-
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 15
diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json
index bcccf7af21..84febe2cab 100644
--- a/keyboards/halokeys/elemental75/info.json
+++ b/keyboards/halokeys/elemental75/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Elemental 75",
+ "keyboard_name": "Elemental75",
+ "manufacturer": "Halokeys",
"url": "",
"maintainer": "shamit05",
+ "usb": {
+ "vid": "0xEA0B",
+ "pid": "0xEA75",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/han60/config.h b/keyboards/han60/config.h
index c96cb6782f..70267edb81 100644
--- a/keyboards/han60/config.h
+++ b/keyboards/han60/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 0x4842
-#define PRODUCT_ID 0xFB60
-#define DEVICE_VER 0x0001
-#define MANUFACTURER HanBoards
-#define PRODUCT han60
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 14
diff --git a/keyboards/han60/info.json b/keyboards/han60/info.json
index 474b20de04..1722996c85 100644
--- a/keyboards/han60/info.json
+++ b/keyboards/han60/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "han60",
+ "manufacturer": "HanBoards",
"maintainer": "qmk",
"url": "hanboards.com",
+ "usb": {
+ "vid": "0x4842",
+ "pid": "0xFB60",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/hand88/config.h b/keyboards/hand88/config.h
index 7e013224dd..78e7dadc9b 100755
--- a/keyboards/hand88/config.h
+++ b/keyboards/hand88/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 0x8968
-#define PRODUCT_ID 0x3838
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Yiancar-Designs
-#define PRODUCT Hand 88
-
/* key matrix size */
#define MATRIX_ROWS 6
#define MATRIX_COLS 17
diff --git a/keyboards/hand88/info.json b/keyboards/hand88/info.json
index 1afb77570c..05cef0d06c 100755
--- a/keyboards/hand88/info.json
+++ b/keyboards/hand88/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "Hand 88",
+ "manufacturer": "Yiancar-Designs",
"url": "https://yiancar-designs.com",
"maintainer": "Yiancar-Designs",
+ "usb": {
+ "vid": "0x8968",
+ "pid": "0x3838",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25}, {"x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"x":11, "y":5.25, "w":1.5}, {"x":12.5, "y":5.25}, {"x":13.5, "y":5.25, "w":1.5}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
diff --git a/keyboards/hardlineworks/otd_plus/config.h b/keyboards/hardlineworks/otd_plus/config.h
index 15e6df7588..77b340c893 100644
--- a/keyboards/hardlineworks/otd_plus/config.h
+++ b/keyboards/hardlineworks/otd_plus/config.h
@@ -2,13 +2,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x484C // "HL"
-#define PRODUCT_ID 0x0087 // "TKL"
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Hardlineworks
-#define PRODUCT OTD-PLUS
-
/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 9
diff --git a/keyboards/hardlineworks/otd_plus/info.json b/keyboards/hardlineworks/otd_plus/info.json
index 59668dc243..d61987b65f 100644
--- a/keyboards/hardlineworks/otd_plus/info.json
+++ b/keyboards/hardlineworks/otd_plus/info.json
@@ -1,7 +1,13 @@
{
"keyboard_name": "OTD-PLUS",
+ "manufacturer": "Hardlineworks",
"url": "",
"maintainer": "Hardlineworks",
+ "usb": {
+ "vid": "0x484C",
+ "pid": "0x0087",
+ "device_version": "0.0.1"
+ },
"layouts":