merge upstream master

14 files changed, 48 insertions, 56 deletions

diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h
index eb2998de7a..54aa5978e2 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/config.h
+++ b/keyboards/owlab/jelly_epoch/hotswap/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       0x4F53  //0x4F53 OS for owl studio
-#define PRODUCT_ID      0x4A4C  //0x4A4C JL for jelly, 0x4A53 JS for jelly solder
-#define DEVICE_VER      0x0001 
-#define MANUFACTURER    OwLab 
-#define PRODUCT         Jelly Epoch
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14
diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json
index 01af496bb2..c5ee4ff522 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/info.json
+++ b/keyboards/owlab/jelly_epoch/hotswap/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "jelly epoch",
+    "keyboard_name": "Jelly Epoch Hotswap",
+    "manufacturer": "OwLab",
     "url": "https://www.popkeyboard.com/products/jrrgvdsyu47wer",
     "maintainer": "Owlab",
+    "usb": {
+        "vid": "0x4F53",
+        "pid": "0x4A4C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h
index cd27b71dd4..54aa5978e2 100644
--- a/keyboards/owlab/jelly_epoch/soldered/config.h
+++ b/keyboards/owlab/jelly_epoch/soldered/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       0x4F53  //0x4F53 OS for owl studio
-#define PRODUCT_ID      0x4A53  //0x4A4C JL for jelly, 0x4A53 JS for jelly solder
-#define DEVICE_VER      0x0001 
-#define MANUFACTURER    OwLab 
-#define PRODUCT         Jelly Epoch
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 14
diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json
index 357634b481..59358ae99f 100644
--- a/keyboards/owlab/jelly_epoch/soldered/info.json
+++ b/keyboards/owlab/jelly_epoch/soldered/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "jelly",
+    "keyboard_name": "Jelly Epoch Soldered",
+    "manufacturer": "OwLab",
     "url": "https://www.popkeyboard.com/products/jrrgvdsyu47wer",
     "maintainer": "Owlab",
+    "usb": {
+        "vid": "0x4F53",
+        "pid": "0x4A53",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h
index d4eef1e021..8b2f9b6340 100644
--- a/keyboards/owlab/spring/config.h
+++ b/keyboards/owlab/spring/config.h
@@ -19,14 +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       0x4F53  //0x4F53 for OwLab
-#define PRODUCT_ID      0x5350  //0x514B SP for Spring
-#define DEVICE_VER      0x0001 
-#define MANUFACTURER    OwLab 
-#define PRODUCT         Spring
-
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json
index bbeee6628b..2664c4ba3c 100644
--- a/keyboards/owlab/spring/info.json
+++ b/keyboards/owlab/spring/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Spring",
+    "manufacturer": "OwLab",
     "url": "",
     "maintainer": "OwLab",
+    "usb": {
+        "vid": "0x4F53",
+        "pid": "0x5350",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_spring": {
             "layout": [
diff --git a/keyboards/owlab/suit80/ansi/config.h b/keyboards/owlab/suit80/ansi/config.h
index 02c44da212..46cc4d82f7 100644
--- a/keyboards/owlab/suit80/ansi/config.h
+++ b/keyboards/owlab/suit80/ansi/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       0x4F53  //0x4F53 OS for owl studio
-#define PRODUCT_ID      0x5355  //0x5355 SU for SUIT
-#define DEVICE_VER      0x0001 
-#define MANUFACTURER    OwLab 
-#define PRODUCT         SUIT80
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
diff --git a/keyboards/owlab/suit80/ansi/info.json b/keyboards/owlab/suit80/ansi/info.json
index b5833c6a60..bdfaccacb8 100644
--- a/keyboards/owlab/suit80/ansi/info.json
+++ b/keyboards/owlab/suit80/ansi/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "suit80",
+    "keyboard_name": "Suit80 ANSI",
+    "manufacturer": "OwLab",
     "url": "",
     "maintainer": "Owlab",
+    "usb": {
+        "vid": "0x4F53",
+        "pid": "0x5355",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
diff --git a/keyboards/owlab/suit80/iso/config.h b/keyboards/owlab/suit80/iso/config.h
index 22968bac15..9aa3f00fb7 100644
--- a/keyboards/owlab/suit80/iso/config.h
+++ b/keyboards/owlab/suit80/iso/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       0x4F53  // 0x4F53 OS for owl studio
-#define PRODUCT_ID      0x5349  //0x5355 SI for SUIT ISO
-#define DEVICE_VER      0x0001 
-#define MANUFACTURER    OwLab 
-#define PRODUCT         SUIT80 ISO
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15
diff --git a/keyboards/owlab/suit80/iso/info.json b/keyboards/owlab/suit80/iso/info.json
index 7c911fe361..0818212330 100644
--- a/keyboards/owlab/suit80/iso/info.json
+++ b/keyboards/owlab/suit80/iso/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "suit80",
+    "keyboard_name": "Suit80 ISO",
+    "manufacturer": "OwLab",
     "url": "",
     "maintainer": "Owlab",
+    "usb": {
+        "vid": "0x4F53",
+        "pid": "0x5349",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 42f97036b3..507b1f75e2 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/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       0x4F53
-#define PRODUCT_ID      0x564F
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    OwLab
-#define PRODUCT         Voice65 Hotswap
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/owlab/voice65/hotswap/info.json b/keyboards/owlab/voice65/hotswap/info.json
index 0481d1acea..006d87749a 100644
--- a/keyboards/owlab/voice65/hotswap/info.json
+++ b/keyboards/owlab/voice65/hotswap/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "voice65 hotswap",
+    "keyboard_name": "Voice65 Hotswap",
+    "manufacturer": "OwLab",
     "url": "https://www.popkeyboard.com/products/67968vn00mzx",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0x4F53",
+        "pid": "0x564F",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_65_ansi_blocker"
     },
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index f0c68dc25b..74ab2db520 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/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       0x4F53
-#define PRODUCT_ID      0x5657
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    OwLab
-#define PRODUCT         Voice65
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/owlab/voice65/soldered/info.json b/keyboards/owlab/voice65/soldered/info.json
index ce33ffc083..7412c89546 100644
--- a/keyboards/owlab/voice65/soldered/info.json
+++ b/keyboards/owlab/voice65/soldered/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "voice65 soldered",
+    "keyboard_name": "Voice65 Soldered",
+    "manufacturer": "OwLab",
     "url": "https://www.popkeyboard.com/products/67968vn00mzx",
     "maintainer": "kb-elmo",
+    "usb": {
+        "vid": "0x4F53",
+        "pid": "0x5657",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [