Merge branch 'master' into taamas

5 files changed, 15 insertions, 19 deletions

diff --git a/keyboards/mechanickeys/miniashen40/config.h b/keyboards/mechanickeys/miniashen40/config.h
index bf2ea6e00f..1510dc9870 100644
--- a/keyboards/mechanickeys/miniashen40/config.h
+++ b/keyboards/mechanickeys/miniashen40/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D4B // MechanicKeys
-#define PRODUCT_ID      0x6D6E
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MechanicKeys
-#define PRODUCT         MINI ASHEN 40
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 13
@@ -41,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { B1, B2, B3, B4 }
 #define MATRIX_COL_PINS { C5, C4, C3, D0, C2, D1, C1, C0, D4, B0, D7, D6, B5 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json
index bf46a8bdcd..94779c888f 100644
--- a/keyboards/mechanickeys/miniashen40/info.json
+++ b/keyboards/mechanickeys/miniashen40/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mini Ashen 40",
+    "manufacturer": "MechanicKeys",
     "url": "",
     "maintainer": "jfescobar18",
+    "usb": {
+        "vid": "0x4D4B",
+        "pid": "0x6D6E",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/mechanickeys/miniashen40/readme.md b/keyboards/mechanickeys/miniashen40/readme.md
index 29f7b68fd1..c61398ba1a 100644
--- a/keyboards/mechanickeys/miniashen40/readme.md
+++ b/keyboards/mechanickeys/miniashen40/readme.md
@@ -32,9 +32,9 @@ 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**: 
   1. Press and hold `BOOT` switch
-  2. Tap `RESET` switch
+  2. Tap `QK_BOOT` switch
   3. Release `BOOT` switch
-* **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
 
 ## Flash bootloader
 * [Follow this instructions](https://github.com/jfescobar18/USBaspLoader)
diff --git a/keyboards/mechanickeys/undead60m/config.h b/keyboards/mechanickeys/undead60m/config.h
index e819cf9971..e21f4c4870 100644
--- a/keyboards/mechanickeys/undead60m/config.h
+++ b/keyboards/mechanickeys/undead60m/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4D4B // MechanicKeys
-#define PRODUCT_ID   0x3C4D
-#define DEVICE_VER   0x0001
-#define MANUFACTURER    MechanicKeys
-#define PRODUCT         Undead 60-M
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
@@ -41,7 +34,6 @@
 */
 #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3, B2 }
-#define UNUSED_PINS
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json
index 5032974857..db1fd60446 100644
--- a/keyboards/mechanickeys/undead60m/info.json
+++ b/keyboards/mechanickeys/undead60m/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Undead-60M",
+    "keyboard_name": "Undead 60-M",
+    "manufacturer": "MechanicKeys",
     "url": "",
     "maintainer": "jfescobar18",
+    "usb": {
+        "vid": "0x4D4B",
+        "pid": "0x3C4D",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [