Merge branch 'master' into taamas

11 files changed, 30 insertions, 34 deletions

diff --git a/keyboards/axolstudio/foundation_gamma/config.h b/keyboards/axolstudio/foundation_gamma/config.h
index 6883e51d57..59b4339428 100644
--- a/keyboards/axolstudio/foundation_gamma/config.h
+++ b/keyboards/axolstudio/foundation_gamma/config.h
@@ -19,13 +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    0x525C
-#define PRODUCT_ID   0xE3EB
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Axolstudio
-#define PRODUCT      Foundation Gamma
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json
index 8845e6ce77..e26e61f1e4 100644
--- a/keyboards/axolstudio/foundation_gamma/info.json
+++ b/keyboards/axolstudio/foundation_gamma/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Foundation Gamma", 
+    "manufacturer": "Axolstudio",
     "url": "https://axolstudio.ca/foundation-gamma", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0x525C",
+        "pid": "0xE3EB",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_ansi_tsangan": "LAYOUT_tkl_f13_ansi_tsangan",
         "LAYOUT_all": "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift"
diff --git a/keyboards/axolstudio/foundation_gamma/readme.md b/keyboards/axolstudio/foundation_gamma/readme.md
index 522ddd16c6..5736a0c1d3 100644
--- a/keyboards/axolstudio/foundation_gamma/readme.md
+++ b/keyboards/axolstudio/foundation_gamma/readme.md
@@ -22,4 +22,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 * **Bootmagic reset**: Hold down the top left key and plug in the keyboard
 * **Physical reset button**: Briefly press the button labeled "SW1" on the back of the PCB
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/axolstudio/helpo/config.h b/keyboards/axolstudio/helpo/config.h
index 927c7cc56c..5251f7aefb 100644
--- a/keyboards/axolstudio/helpo/config.h
+++ b/keyboards/axolstudio/helpo/config.h
@@ -19,13 +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    0x525C
-#define PRODUCT_ID   0xC89F
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Axolstudio
-#define PRODUCT      Helpo
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 5
diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json
index 5ec0cc7d13..5c25c7df05 100644
--- a/keyboards/axolstudio/helpo/info.json
+++ b/keyboards/axolstudio/helpo/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "helpo", 
+    "keyboard_name": "Helpo", 
+    "manufacturer": "Axolstudio",
     "url": "", 
     "maintainer": "kb-elmo", 
+    "usb": {
+        "vid": "0x525C",
+        "pid": "0xC89F",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/axolstudio/yeti/hotswap/config.h b/keyboards/axolstudio/yeti/hotswap/config.h
index 559b62a81d..1f0540c9e1 100644
--- a/keyboards/axolstudio/yeti/hotswap/config.h
+++ b/keyboards/axolstudio/yeti/hotswap/config.h
@@ -19,13 +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    0x525C
-#define PRODUCT_ID   0x9F9E
-#define DEVICE_VER   0x0001
-#define MANUFACTURER DZtech
-#define PRODUCT      Yeti RGB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json
index 72042a98a3..eef82fa2dd 100644
--- a/keyboards/axolstudio/yeti/hotswap/info.json
+++ b/keyboards/axolstudio/yeti/hotswap/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "yeti hotswap",
+  "keyboard_name": "Yeti Hotswap",
+  "manufacturer": "Axolstudio",
   "url": "https://axolstudio.ca/yeti",
   "maintainer": "kb-elmo",
+  "usb": {
+    "vid": "0x525C",
+    "pid": "0x9F9E",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/axolstudio/yeti/hotswap/readme.md b/keyboards/axolstudio/yeti/hotswap/readme.md
index 79fad346f3..4421847705 100644
--- a/keyboards/axolstudio/yeti/hotswap/readme.md
+++ b/keyboards/axolstudio/yeti/hotswap/readme.md
@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/axolstudio/yeti/soldered/config.h b/keyboards/axolstudio/yeti/soldered/config.h
index 34b47bbcac..74468f29e2 100644
--- a/keyboards/axolstudio/yeti/soldered/config.h
+++ b/keyboards/axolstudio/yeti/soldered/config.h
@@ -19,13 +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    0x525C
-#define PRODUCT_ID   0x9F9F
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Axolstudio
-#define PRODUCT      Yeti
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/axolstudio/yeti/soldered/info.json b/keyboards/axolstudio/yeti/soldered/info.json
index 9c6c122ce3..e7e0143786 100644
--- a/keyboards/axolstudio/yeti/soldered/info.json
+++ b/keyboards/axolstudio/yeti/soldered/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "yeti soldered",
+  "keyboard_name": "Yeti Soldered",
+  "manufacturer": "Axolstudio",
   "url": "https://axolstudio.ca/yeti",
   "maintainer": "kb-elmo",
+  "usb": {
+    "vid": "0x525C",
+    "pid": "0x9F9F",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_alice": {
       "layout": [
diff --git a/keyboards/axolstudio/yeti/soldered/readme.md b/keyboards/axolstudio/yeti/soldered/readme.md
index 78ca4d5deb..429cc7ce9a 100644
--- a/keyboards/axolstudio/yeti/soldered/readme.md
+++ b/keyboards/axolstudio/yeti/soldered/readme.md
@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available