summaryrefslogtreecommitdiff
path: root/keyboards/keyhive
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/keyhive
parenteceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff)
parent201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff)
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/keyhive')
-rw-r--r--keyboards/keyhive/navi10/info.json5
-rw-r--r--keyboards/keyhive/navi10/rev0/config.h7
-rw-r--r--keyboards/keyhive/navi10/rev0/info.json5
-rw-r--r--keyboards/keyhive/navi10/rev2/config.h7
-rw-r--r--keyboards/keyhive/navi10/rev2/info.json5
-rw-r--r--keyboards/keyhive/navi10/rev3/config.h7
-rw-r--r--keyboards/keyhive/navi10/rev3/info.json5
-rw-r--r--keyboards/keyhive/uno/info.json6
-rw-r--r--keyboards/keyhive/uno/rev1/config.h7
-rw-r--r--keyboards/keyhive/uno/rev1/info.json6
-rw-r--r--keyboards/keyhive/uno/rev2/config.h7
-rw-r--r--keyboards/keyhive/uno/rev2/info.json6
12 files changed, 37 insertions, 36 deletions
diff --git a/keyboards/keyhive/navi10/info.json b/keyboards/keyhive/navi10/info.json
index e3fc49fbed..ecafbeb089 100644
--- a/keyboards/keyhive/navi10/info.json
+++ b/keyboards/keyhive/navi10/info.json
@@ -1,7 +1,12 @@
{
"keyboard_name": "Navi10",
+ "manufacturer": "emdarcher",
"url": "",
"maintainer": "emdarcher",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0x0000"
+ },
"layouts": {
"LAYOUT": {
"layout": [{"label":"Fn", "x":0, "y":0}, {"label":"Home", "x":1, "y":0}, {"label":"PgUp", "x":2, "y":0}, {"label":"Del", "x":0, "y":1}, {"label":"End", "x":1, "y":1}, {"label":"PgDn", "x":2, "y":1}, {"label":"Up", "x":1, "y":3}, {"label":"Left", "x":0, "y":4}, {"label":"Down", "x":1, "y":4}, {"label":"Right", "x":2, "y":4}]
diff --git a/keyboards/keyhive/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index 0d4685b17f..3d64b02771 100644
--- a/keyboards/keyhive/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/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 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER emdarcher
-#define PRODUCT Navi10
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 3
diff --git a/keyboards/keyhive/navi10/rev0/info.json b/keyboards/keyhive/navi10/rev0/info.json
new file mode 100644
index 0000000000..90ac25f360
--- /dev/null
+++ b/keyboards/keyhive/navi10/rev0/info.json
@@ -0,0 +1,5 @@
+{
+ "usb": {
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/keyhive/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index c128e8ecdc..8d3217d65c 100644
--- a/keyboards/keyhive/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/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 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0002
-#define MANUFACTURER emdarcher
-#define PRODUCT Navi10
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 3
diff --git a/keyboards/keyhive/navi10/rev2/info.json b/keyboards/keyhive/navi10/rev2/info.json
new file mode 100644
index 0000000000..e557e4d307
--- /dev/null
+++ b/keyboards/keyhive/navi10/rev2/info.json
@@ -0,0 +1,5 @@
+{
+ "usb": {
+ "device_version": "0.0.2"
+ }
+}
diff --git a/keyboards/keyhive/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 74cf7f77ca..7336abb6d6 100644
--- a/keyboards/keyhive/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/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 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0003
-#define MANUFACTURER emdarcher
-#define PRODUCT Navi10
-
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 3
diff --git a/keyboards/keyhive/navi10/rev3/info.json b/keyboards/keyhive/navi10/rev3/info.json
new file mode 100644
index 0000000000..b377cdff00
--- /dev/null
+++ b/keyboards/keyhive/navi10/rev3/info.json
@@ -0,0 +1,5 @@
+{
+ "usb": {
+ "device_version": "0.0.3"
+ }
+}
diff --git a/keyboards/keyhive/uno/info.json b/keyboards/keyhive/uno/info.json
index d426f9e426..9d39163a1b 100644
--- a/keyboards/keyhive/uno/info.json
+++ b/keyboards/keyhive/uno/info.json
@@ -1,7 +1,11 @@
{
- "keyboard_name": "Uno",
+ "manufacturer": "Broekhuijsen",
"url": "https://www.reddit.com/r/mechmarket/comments/gyijm7/gb_uno/",
"maintainer": "Snipeye",
+ "usb": {
+ "vid": "0xFEED",
+ "pid": "0xACC8"
+ },
"layouts": {
"LAYOUT": {
"layout": [ {"x": 0, "y": 0 }]
diff --git a/keyboards/keyhive/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index cbd2306106..6e9298e261 100644
--- a/keyboards/keyhive/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
@@ -17,13 +17,6 @@
#pragma once
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xACC8
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Broekhuijsen
-#define PRODUCT Uno rev1
-
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
// #define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/keyhive/uno/rev1/info.json b/keyboards/keyhive/uno/rev1/info.json
new file mode 100644
index 0000000000..69d6dfba0d
--- /dev/null
+++ b/keyboards/keyhive/uno/rev1/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Uno rev1",
+ "usb": {
+ "device_version": "0.0.1"
+ }
+}
diff --git a/keyboards/keyhive/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index 0539c124b7..f53e38b617 100644
--- a/keyboards/keyhive/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
@@ -17,13 +17,6 @@
#pragma once
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0xACC8
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Broekhuijsen
-#define PRODUCT Uno rev2
-
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
/* ENCODER */
diff --git a/keyboards/keyhive/uno/rev2/info.json b/keyboards/keyhive/uno/rev2/info.json
new file mode 100644
index 0000000000..787f306351
--- /dev/null
+++ b/keyboards/keyhive/uno/rev2/info.json
@@ -0,0 +1,6 @@
+{
+ "keyboard_name": "Uno rev2",
+ "usb": {
+ "device_version": "0.0.2"
+ }
+}