Merge remote-tracking branch 'upstream/master' into develop

2 files changed, 7 insertions, 8 deletions

diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
index b754a7810c..7bb092834b 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/config.h
@@ -17,13 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x5148
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    tomsaleeba
-#define PRODUCT         Ergoslab Keyboard
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 10
diff --git a/keyboards/ergoslab/info.json b/keyboards/ergoslab/rev1/info.json
index e37a3b7cbf..38530960a5 100644
--- a/keyboards/ergoslab/info.json
+++ b/keyboards/ergoslab/rev1/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "ergoslab",
+  "keyboard_name": "Ergoslab Keyboard",
+  "manufacturer": "tomsaleeba",
   "url": "https://github.com/tomsaleeba/ergoslab",
   "maintainer": "tomsaleeba",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x5148",
+    "device_version": "1.0.0"
+  },
   "layouts": {
     "LAYOUT_ergoslab": {
       "layout": [