summaryrefslogtreecommitdiffstats
path: root/keyboards/handwired/uthol
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-08-20 00:32:18 +0000
committerQMK Bot <hello@qmk.fm>2022-08-20 00:32:18 +0000
commiteceed6c50bb2a6a85da992c206b95be8cf9d3d49 (patch)
tree3006f82724a5352bb199296a1709036ca2fe3744 /keyboards/handwired/uthol
parentf1ac92ac63b85151369e82ccdcbf4ac372933aaa (diff)
parent48792b030b754c8b3983a97071db1b09ae6353d4 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/handwired/uthol')
-rw-r--r--keyboards/handwired/uthol/config.h4
-rw-r--r--keyboards/handwired/uthol/info.json6
-rw-r--r--keyboards/handwired/uthol/rev1/config.h4
-rw-r--r--keyboards/handwired/uthol/rev1/info.json6
-rw-r--r--keyboards/handwired/uthol/rev2/config.h4
-rw-r--r--keyboards/handwired/uthol/rev2/info.json6
-rw-r--r--keyboards/handwired/uthol/rev3/config.h4
-rw-r--r--keyboards/handwired/uthol/rev3/info.json6
8 files changed, 23 insertions, 17 deletions
diff --git a/keyboards/handwired/uthol/config.h b/keyboards/handwired/uthol/config.h
index 1e0b533386..de93efe186 100644
--- a/keyboards/handwired/uthol/config.h
+++ b/keyboards/handwired/uthol/config.h
@@ -19,10 +19,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define MANUFACTURER Uthol
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 12
diff --git a/keyboards/handwired/uthol/info.json b/keyboards/handwired/uthol/info.json
index 40f99dbade..f8891331ed 100644
--- a/keyboards/handwired/uthol/info.json
+++ b/keyboards/handwired/uthol/info.json
@@ -1,7 +1,11 @@
{
- "keyboard_name": "Uthol",
+ "manufacturer": "Uthol",
"url": "",
"maintainer": "uthol",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x67F3"
+ },
"layouts": {
"LAYOUT_uthol": {
"layout": [
diff --git a/keyboards/handwired/uthol/rev1/config.h b/keyboards/handwired/uthol/rev1/config.h
index 30c1e17e3e..89115c5aee 100644
--- a/keyboards/handwired/uthol/rev1/config.h
+++ b/keyboards/handwired/uthol/rev1/config.h
@@ -19,10 +19,6 @@
#include "config_common.h"
-#define DEVICE_VER 0x0001
-#define PRODUCT_ID 0x67F3
-#define PRODUCT UtholOne
-
/* Uthol PCB default pin-out */
#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
#define MATRIX_COL_PINS { D3, B6, B2, B3, B1, F7, F6, F5, F4, B5, B4, D2 }
diff --git a/keyboards/handwired/uthol/rev1/info.json b/keyboards/handwired/uthol/rev1/info.json
new file mode 100644
index 0000000000..44de6469f5
--- /dev/null
+++ b/keyboards/handwired/uthol/rev1/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "UtholOne",
+ "usb": {
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
index 2750282d30..6fccc3047d 100644
--- a/keyboards/handwired/uthol/rev2/config.h
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -19,10 +19,6 @@
#include "config_common.h"
-#define DEVICE_VER 0x0002
-#define PRODUCT_ID 0x67F3
-#define PRODUCT UtholTwo
-
/* Uthol PCB default pin-out */
#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, B5, B4, B6, B2, B3 }
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json
new file mode 100644
index 0000000000..fbb7309629
--- /dev/null
+++ b/keyboards/handwired/uthol/rev2/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "UtholTwo",
+ "usb": {
+ "device_version": "0.0.2"
+ }
+}
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index ded5aead8e..14da0d8a60 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -19,10 +19,6 @@
#include "config_common.h"
-#define DEVICE_VER 0x0003
-#define PRODUCT_ID 0x67F3
-#define PRODUCT UtholThree
-
/* key matrix size */
// A11 and A12 dont work. They are reserved for USB. B2 is reserved for BOOT1
#define MATRIX_COL_PINS \
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json
new file mode 100644
index 0000000000..44078b4ab1
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "UtholThree",
+ "usb": {
+ "device_version": "0.0.3"
+ }
+}