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

8 files changed, 28 insertions, 28 deletions

diff --git a/keyboards/avalanche/v1/config.h b/keyboards/avalanche/v1/config.h
index 32533c5cc9..e641a20f93 100644
--- a/keyboards/avalanche/v1/config.h
+++ b/keyboards/avalanche/v1/config.h
@@ -3,12 +3,6 @@
 
 #pragma once
 
-#define VENDOR_ID       0xCEE2
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    vitvlkv
-#define PRODUCT         Avalanche
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 8
 
diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json
index 907face922..d753cce4bc 100644
--- a/keyboards/avalanche/v1/info.json
+++ b/keyboards/avalanche/v1/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Avalanche v1",
+    "keyboard_name": "Avalanche",
+    "manufacturer": "vitvlkv",
     "url": "https://github.com/vlkv/avalanche",
     "maintainer": "vlkv",
+    "usb": {
+        "vid": "0xCEE2",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/avalanche/v2/config.h b/keyboards/avalanche/v2/config.h
index 55cbd30b1c..16b26d8ffc 100644
--- a/keyboards/avalanche/v2/config.h
+++ b/keyboards/avalanche/v2/config.h
@@ -3,12 +3,6 @@
 
 #pragma once
 
-#define VENDOR_ID       0xCEE2
-#define PRODUCT_ID      0x0002
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    vitvlkv
-#define PRODUCT         Avalanche
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7
 
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
index 6809c99b4e..52c03b57a3 100644
--- a/keyboards/avalanche/v2/info.json
+++ b/keyboards/avalanche/v2/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Avalanche v2",
+    "keyboard_name": "Avalanche",
+    "manufacturer": "vitvlkv",
     "url": "https://github.com/vlkv/avalanche",
     "maintainer": "vlkv",
+    "usb": {
+        "vid": "0xCEE2",
+        "pid": "0x0002",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/avalanche/v3/config.h b/keyboards/avalanche/v3/config.h
index 3dc537170d..4c4e05ecf4 100644
--- a/keyboards/avalanche/v3/config.h
+++ b/keyboards/avalanche/v3/config.h
@@ -3,12 +3,6 @@
 
 #pragma once
 
-#define VENDOR_ID       0xCEE2
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    vitvlkv
-#define PRODUCT         Avalanche
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7
 
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
index 39b8b51b38..1869c0165f 100644
--- a/keyboards/avalanche/v3/info.json
+++ b/keyboards/avalanche/v3/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Avalanche v3",
+    "keyboard_name": "Avalanche",
+    "manufacturer": "vitvlkv",
     "url": "https://github.com/vlkv/avalanche",
     "maintainer": "vlkv",
+    "usb": {
+        "vid": "0xCEE2",
+        "pid": "0x0003",
+        "device_version": "0.0.3"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/avalanche/v4/config.h b/keyboards/avalanche/v4/config.h
index d2082635d8..c83c90c0ba 100644
--- a/keyboards/avalanche/v4/config.h
+++ b/keyboards/avalanche/v4/config.h
@@ -3,12 +3,6 @@
 
 #pragma once
 
-#define VENDOR_ID       0xCEE2
-#define PRODUCT_ID      0x0003
-#define DEVICE_VER      0x0004
-#define MANUFACTURER    vitvlkv
-#define PRODUCT         Avalanche
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 7
 
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
index 53e227bcf1..b96cdc5ea7 100644
--- a/keyboards/avalanche/v4/info.json
+++ b/keyboards/avalanche/v4/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Avalanche v4",
+    "keyboard_name": "Avalanche",
+    "manufacturer": "vitvlkv",
     "url": "https://github.com/vlkv/avalanche",
     "maintainer": "vlkv",
+    "usb": {
+        "vid": "0xCEE2",
+        "pid": "0x0004",
+        "device_version": "0.0.4"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [