summaryrefslogtreecommitdiff
path: root/keyboards/the_uni
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2022-08-20 10:55:40 +1000
committerfauxpark <fauxpark@gmail.com>2022-08-20 10:55:40 +1000
commit61689ae6096f55148fdc4d333c6a74a79486eba3 (patch)
tree1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/the_uni
parenteceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff)
parent201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff)
downloadqmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.tar.gz
qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.zip
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/the_uni')
-rw-r--r--keyboards/the_uni/info.json5
-rw-r--r--keyboards/the_uni/pro_micro/config.h7
-rw-r--r--keyboards/the_uni/pro_micro/info.json5
-rw-r--r--keyboards/the_uni/usb_c/config.h7
-rw-r--r--keyboards/the_uni/usb_c/info.json5
5 files changed, 15 insertions, 14 deletions
diff --git a/keyboards/the_uni/info.json b/keyboards/the_uni/info.json
index a8b5a1b5cc..b7cb80957e 100644
--- a/keyboards/the_uni/info.json
+++ b/keyboards/the_uni/info.json
@@ -1,7 +1,12 @@
{
"keyboard_name": "The Uni",
+ "manufacturer": "stenokeyboards",
"url": "https://www.stenokeyboards.com",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x9000",
+ "pid": "0x0001"
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/the_uni/pro_micro/config.h b/keyboards/the_uni/pro_micro/config.h
index 61a866d8db..dc0493face 100644
--- a/keyboards/the_uni/pro_micro/config.h
+++ b/keyboards/the_uni/pro_micro/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 0x9000
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0001
-#define MANUFACTURER stenokeyboards
-#define PRODUCT The Uni
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 11
diff --git a/keyboards/the_uni/pro_micro/info.json b/keyboards/the_uni/pro_micro/info.json
new file mode 100644
index 0000000000..90ac25f360
--- /dev/null
+++ b/keyboards/the_uni/pro_micro/info.json
@@ -0,0 +1,5 @@
+{
+ "usb": {
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/the_uni/usb_c/config.h b/keyboards/the_uni/usb_c/config.h
index c45b450838..02b6ad5a1f 100644
--- a/keyboards/the_uni/usb_c/config.h
+++ b/keyboards/the_uni/usb_c/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 0x9000
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0002
-#define MANUFACTURER stenokeyboards
-#define PRODUCT The Uni
-
/* key matrix size */
#define MATRIX_ROWS 3
#define MATRIX_COLS 11
diff --git a/keyboards/the_uni/usb_c/info.json b/keyboards/the_uni/usb_c/info.json
new file mode 100644
index 0000000000..e557e4d307
--- /dev/null
+++ b/keyboards/the_uni/usb_c/info.json
@@ -0,0 +1,5 @@
+{
+ "usb": {
+ "device_version": "0.0.2"
+ }
+}