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

keyboards/mechlovin/hex4b/config.h

@@ -19,11 +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    0x4D4C
-#define PRODUCT_ID   0x0675 //Hex-75
-#define MANUFACTURER Mechlovin Studio
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 15

keyboards/mechlovin/hex4b/info.json

@@ -1,7 +1,11 @@
 {
-    "keyboard_name": "Hex4B",
+    "manufacturer": "Mechlovin Studio",
     "url": "",
     "maintainer": "Hex-Keyboard&Mechlovin",
+    "usb": {
+        "vid": "0x4D4C",
+        "pid": "0x0675"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_bs",
         "LAYOUT_all": "LAYOUT_split_bs"

keyboards/mechlovin/hex4b/rev1/config.h

@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER   0x0001
-#define PRODUCT      Hex-4B Rev.1
-
 /*
  * Keyboard Matrix Assignments
  *

keyboards/mechlovin/hex4b/rev1/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Hex-4B Rev.1",
+    "usb": {
+        "device_version": "0.0.1"
+    }
+}

keyboards/mechlovin/hex4b/rev2/config.h

@@ -19,12 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER   0x0002
-#define PRODUCT      Hex-4B Rev.2
-
-
-
 /*
  * Keyboard Matrix Assignments
  *

keyboards/mechlovin/hex4b/rev2/info.json

@@ -0,0 +1,6 @@
+{
+    "keyboard_name": "Hex-4B Rev.2",
+    "usb": {
+        "device_version": "0.0.2"
+    }
+}