Merge branch 'master' into taamas

16 files changed, 49 insertions, 55 deletions

diff --git a/keyboards/ocean/addon/config.h b/keyboards/ocean/addon/config.h
index 1b221b65bd..00d6a02a9d 100644
--- a/keyboards/ocean/addon/config.h
+++ b/keyboards/ocean/addon/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x9624
-#define PRODUCT_ID      0x0012
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ocean
-#define PRODUCT         AddOn
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 7
@@ -41,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 }
-#define UNUSED_PINS     { D0, D1, D2, D3, D4, F4 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/info.json
index 75e1eb2c48..05d41ab59a 100644
--- a/keyboards/ocean/addon/info.json
+++ b/keyboards/ocean/addon/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "AddOn",
+    "manufacturer": "Ocean",
     "url": "tokopedia.com/kbdksp",
     "maintainer": "Ocean",
+    "usb": {
+        "vid": "0x9624",
+        "pid": "0x0012",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ocean/gin_v2/config.h b/keyboards/ocean/gin_v2/config.h
index 2f70ad3f5e..1c0dabc4e3 100644
--- a/keyboards/ocean/gin_v2/config.h
+++ b/keyboards/ocean/gin_v2/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x9624
-#define PRODUCT_ID      0x0005
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ocean
-#define PRODUCT         Gin V2
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
@@ -41,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS     { D2, D3 }
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/gin_v2/info.json b/keyboards/ocean/gin_v2/info.json
index cd9d809419..d7493b39c3 100644
--- a/keyboards/ocean/gin_v2/info.json
+++ b/keyboards/ocean/gin_v2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Gin V2",
+    "manufacturer": "Ocean",
     "url": "",
     "maintainer": "Ocean",
+    "usb": {
+        "vid": "0x9624",
+        "pid": "0x0005",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/ocean/slamz/config.h b/keyboards/ocean/slamz/config.h
index 5f27a3a6d0..aff184b243 100644
--- a/keyboards/ocean/slamz/config.h
+++ b/keyboards/ocean/slamz/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x9624
-#define PRODUCT_ID      0x0011
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ocean
-#define PRODUCT         Slamz
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 10
diff --git a/keyboards/ocean/slamz/info.json b/keyboards/ocean/slamz/info.json
index 4d5fe17dc3..6534007c3b 100644
--- a/keyboards/ocean/slamz/info.json
+++ b/keyboards/ocean/slamz/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Slamz", 
+    "manufacturer": "Ocean",
     "url": "", 
     "maintainer": "Ocean", 
+    "usb": {
+        "vid": "0x9624",
+        "pid": "0x0011",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
diff --git a/keyboards/ocean/stealth/config.h b/keyboards/ocean/stealth/config.h
index ab1860332e..b0240c4a0e 100644
--- a/keyboards/ocean/stealth/config.h
+++ b/keyboards/ocean/stealth/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x9624
-#define PRODUCT_ID      0x0010
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ocean
-#define PRODUCT         Stealth
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 3
@@ -41,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { D1 }
 #define MATRIX_COL_PINS { D0, D4, C6 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/stealth/info.json b/keyboards/ocean/stealth/info.json
index 3342319c8e..7b45dcd520 100644
--- a/keyboards/ocean/stealth/info.json
+++ b/keyboards/ocean/stealth/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Stealth", 
+    "manufacturer": "Ocean",
     "url": "", 
     "maintainer": "Ocean", 
+    "usb": {
+        "vid": "0x9624",
+        "pid": "0x0010",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0, "w":2.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}]
diff --git a/keyboards/ocean/sus/config.h b/keyboards/ocean/sus/config.h
index c3e2a3263a..2446daee7b 100644
--- a/keyboards/ocean/sus/config.h
+++ b/keyboards/ocean/sus/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x9624
-#define PRODUCT_ID      0x0009
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ocean
-#define PRODUCT         Sus
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 3
@@ -41,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { B5, B4, E6, D7 }
 #define MATRIX_COL_PINS { C6, D4, D0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/sus/info.json b/keyboards/ocean/sus/info.json
index 3665038b6f..580379f25a 100644
--- a/keyboards/ocean/sus/info.json
+++ b/keyboards/ocean/sus/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "SUS", 
+    "keyboard_name": "Sus", 
+    "manufacturer": "Ocean",
     "url": " ", 
     "maintainer": "Ocean", 
+    "usb": {
+      "vid": "0x9624",
+      "pid": "0x0009",
+      "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_4x3": {
           "layout": [
diff --git a/keyboards/ocean/wang_ergo/config.h b/keyboards/ocean/wang_ergo/config.h
index 62c9d2fca2..05b6b687ed 100644
--- a/keyboards/ocean/wang_ergo/config.h
+++ b/keyboards/ocean/wang_ergo/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x9624
-#define PRODUCT_ID      0x0008
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ocean
-#define PRODUCT         Wang Ergo
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
@@ -41,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/wang_ergo/info.json b/keyboards/ocean/wang_ergo/info.json
index 5ade58c54c..04065cdb07 100644
--- a/keyboards/ocean/wang_ergo/info.json
+++ b/keyboards/ocean/wang_ergo/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Wang Ergo",
+    "manufacturer": "Ocean",
     "url": "",
     "maintainer": "oceeean",
+    "usb": {
+        "vid": "0x9624",
+        "pid": "0x0008",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_all"
     },
diff --git a/keyboards/ocean/wang_v2/config.h b/keyboards/ocean/wang_v2/config.h
index f5f1e9231c..e9953e63cc 100644
--- a/keyboards/ocean/wang_v2/config.h
+++ b/keyboards/ocean/wang_v2/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x9624
-#define PRODUCT_ID      0x0004
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ocean
-#define PRODUCT         Wang V2
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13
@@ -41,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
 #define MATRIX_ROW_PINS { F4, F5, F6, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, D3 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/info.json
index 310f448956..7a04f23e1b 100644
--- a/keyboards/ocean/wang_v2/info.json
+++ b/keyboards/ocean/wang_v2/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Wang V2", 
+    "manufacturer": "Ocean",
     "url": "", 
     "maintainer": "Ocean", 
+    "usb": {
+        "vid": "0x9624",
+        "pid": "0x0004",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":0.75, "y":1, "w":1.25}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1, "w":1.75}, {"x":0.25, "y":2, "w":1.75}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.25}, {"x":5, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
diff --git a/keyboards/ocean/yuri/config.h b/keyboards/ocean/yuri/config.h
index d8313fd71f..e04d70a50b 100644
--- a/keyboards/ocean/yuri/config.h
+++ b/keyboards/ocean/yuri/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x9624
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Ocean
-#define PRODUCT         Yuri
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14
diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/info.json
index 68d9668579..458c11d091 100644
--- a/keyboards/ocean/yuri/info.json
+++ b/keyboards/ocean/yuri/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Yuri", 
+    "manufacturer": "Ocean",
     "url": "tokopedia.com/strat0s", 
     "maintainer": "Ocean", 
+    "usb": {
+        "vid": "0x9624",
+        "pid": "0x0003",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0},