Merge branch 'master' into taamas

14 files changed, 47 insertions, 49 deletions

diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 02d8522606..585f632c40 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -18,11 +18,6 @@
 
 /* USB Device descriptor parameter */
 #include "config_common.h"
-#define VENDOR_ID       0x7C88 // "hw" = haierwangwei2005
-#define PRODUCT_ID      0x7C97 // "lp" = latin17RGB
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    18438880
-#define PRODUCT         Latin17RGB
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -40,7 +35,6 @@
  */
 #define MATRIX_ROW_PINS {C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS {F7, F6, F5, F4}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/latincompass/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
index 61aae4f8d6..fa2320474f 100644
--- a/keyboards/latincompass/latin17rgb/info.json
+++ b/keyboards/latincompass/latin17rgb/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "latin17rgb",
+  "keyboard_name": "Latin17RGB",
+  "manufacturer": "18438880",
   "url": "",
   "maintainer": "18438880",
+  "usb": {
+    "vid": "0x7C88",
+    "pid": "0x7C97",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_numpad_5x4": {
       "layout": [
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index eb10693501..019e18751d 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */ 
-#define VENDOR_ID       0x6C63 // "lc" = latincompass
-#define PRODUCT_ID      0x6C62 // "lb" = latin47BLE
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    latincompass
-#define PRODUCT         Latin47BLE
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
@@ -41,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3 }
 #define MATRIX_COL_PINS { D6, D7, B5, B6 ,C6, C7, F7, F6, F5, F4, F1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/latincompass/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
index 56b14136d8..aeb6ad305e 100644
--- a/keyboards/latincompass/latin47ble/info.json
+++ b/keyboards/latincompass/latin47ble/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Latin47ble",
+    "keyboard_name": "Latin47BLE",
+    "manufacturer": "latincompass",
     "url": "",
     "maintainer": "latincompass",
+    "usb": {
+        "vid": "0x6C63",
+        "pid": "0x6C62",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_planck_mit": {
             "layout": [
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index fa4ea39288..0058297dda 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -17,11 +17,6 @@
 
 /* USB Device descriptor parameter */
 #include "config_common.h"
-#define VENDOR_ID       0x6C63 // "lc" = latincompass
-#define PRODUCT_ID      0x6C69 // "lp" = latin60RGB
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    latincompass
-#define PRODUCT         Latin60RGB
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -39,7 +34,6 @@
  */
 #define MATRIX_ROW_PINS {C7, C6, B6, B5, B4 }
 #define MATRIX_COL_PINS {F7, F6, F5, F4, F1, F0, E6, B0, B1, B2, B3, D6, D4, D3}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/latincompass/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json
index a493befaf9..21765b94b9 100644
--- a/keyboards/latincompass/latin60rgb/info.json
+++ b/keyboards/latincompass/latin60rgb/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "latin60rgb",
+  "keyboard_name": "Latin60RGB",
+  "manufacturer": "latincompass",
   "url": "",
   "maintainer": "latincompass",
+  "usb": {
+    "vid": "0x6C63",
+    "pid": "0x6C69",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_60_latin_hhkb": {
       "layout": [
diff --git a/keyboards/latincompass/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
index 68e8e7b293..5bb3ca4562 100644
--- a/keyboards/latincompass/latin64ble/config.h
+++ b/keyboards/latincompass/latin64ble/config.h
@@ -16,18 +16,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #pragma once
 
 #include "config_common.h"
-#define VENDOR_ID       0x6C63 // "lc" = latincompass
-#define PRODUCT_ID      0x6C71 // "lp" = latin64BLE
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    latincompass
-#define PRODUCT         Latin64BLE
 
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D6, D7, B5, B6 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json
index 99fe62b266..b3475a2aab 100644
--- a/keyboards/latincompass/latin64ble/info.json
+++ b/keyboards/latincompass/latin64ble/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Latin64ble",
+    "keyboard_name": "Latin64BLE",
+    "manufacturer": "latincompass",
     "url": "",
     "maintainer": "latincompass",
+    "usb": {
+        "vid": "0x6C63",
+        "pid": "0x6C71",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index 9beebe0f87..17083580a6 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -19,11 +19,6 @@
 
 /* USB Device descriptor parameter */
 #include "config_common.h"
-#define VENDOR_ID       0x7C88 // "hw" = haierwangwei
-#define PRODUCT_ID      0x7C96 // "lp" = latin6RGB
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    18438880
-#define PRODUCT         Latin6rgb
 
 /* key matrix size */
 #define MATRIX_ROWS 2
@@ -41,7 +36,6 @@
  */
 #define MATRIX_ROW_PINS {C7, C6 }
 #define MATRIX_COL_PINS {F7, F6, F5}
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/latincompass/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json
index 26508e9320..a2c63ae8ea 100644
--- a/keyboards/latincompass/latin6rgb/info.json
+++ b/keyboards/latincompass/latin6rgb/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "latin6rgb",
+  "keyboard_name": "Latin6rgb",
+  "manufacturer": "18438880",
   "url": "",
   "maintainer": "18438880",
+  "usb": {
+    "vid": "0x7C88",
+    "pid": "0x7C96",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_numpad_2x3": {
       "layout": [
diff --git a/keyboards/latincompass/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
index 5cff076d9d..255ddc89db 100644
--- a/keyboards/latincompass/latinpad/config.h
+++ b/keyboards/latincompass/latinpad/config.h
@@ -17,18 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #pragma once
 
 #include "config_common.h"
-#define VENDOR_ID       0x6C63 // "lc" = latincompass
-#define PRODUCT_ID      0x6C70 // "lp" = latinpad
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    latincompass
-#define PRODUCT         latinpad
 
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 4
 #define MATRIX_ROW_PINS { F4, F5, F6, F7, B1 }
 #define MATRIX_COL_PINS { D4, C6, D7, E6 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/latincompass/latinpad/info.json b/keyboards/latincompass/latinpad/info.json
index 0c86498e7d..0a2ef6f69b 100644
--- a/keyboards/latincompass/latinpad/info.json
+++ b/keyboards/latincompass/latinpad/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "latinpad",
+    "manufacturer": "latincompass",
     "url": "https://github.com/latincompass/2-RotaryEncoder-pad",
     "maintainer": "latincompass",
+    "usb": {
+        "vid": "0x6C63",
+        "pid": "0x6C70",
+        "device_version": "0.0.1"
+    },
     "layouts": {
 
         "LAYOUT": {
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index fc833a0269..09198df612 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #pragma once
 
 #include "config_common.h"
-#define VENDOR_ID       0x7C88 // "hw" = haierwangwei2005
-#define PRODUCT_ID      0x7C98 // "lp" = latinpadble
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    haierwangwei2005
-#define PRODUCT         latinpadble
 
 // #define NO_ACTION_LAYER
 // #define NO_ACTION_TAPPING
@@ -32,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #define MATRIX_COLS 4
 #define MATRIX_ROW_PINS { F0, F6, F5, F4, F1 }
 #define MATRIX_COL_PINS { D6, D7, B5, B6 }
-#define UNUSED_PINS
 
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/latincompass/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json
index b640d3e46e..2f0bf01616 100644
--- a/keyboards/latincompass/latinpadble/info.json
+++ b/keyboards/latincompass/latinpadble/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "latinpadble",
+    "manufacturer": "haierwangwei2005",
     "url": "https://github.com/latincompass/2-RotaryEncoder-pad",
     "maintainer": "haierwangwei2005",
+    "usb": {
+        "vid": "0x7C88",
+        "pid": "0x7C98",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_pad": {
             "layout": [