merge upstream master

3 files changed, 7 insertions, 8 deletions

diff --git a/keyboards/machkeyboards/mach3/config.h b/keyboards/machkeyboards/mach3/config.h
index d78f8dce9b..1f3533d177 100644
--- a/keyboards/machkeyboards/mach3/config.h
+++ b/keyboards/machkeyboards/mach3/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4D41
-#define PRODUCT_ID      0x4D33
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    MachKeyboard
-#define PRODUCT         Mach33
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
diff --git a/keyboards/machkeyboards/mach3/info.json b/keyboards/machkeyboards/mach3/info.json
index 42f29a9873..3eab9a1a3f 100644
--- a/keyboards/machkeyboards/mach3/info.json
+++ b/keyboards/machkeyboards/mach3/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Mach 3",
+    "manufacturer": "MachKeyboard",
     "url": "https://machkeyboards.com",
     "maintainer": "etiennelepagel",
+    "usb": {
+        "vid": "0x4D41",
+        "pid": "0x4D33",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_3x3": {
             "layout": [
diff --git a/keyboards/machkeyboards/mach3/readme.md b/keyboards/machkeyboards/mach3/readme.md
index 16c61511b1..d4c6f6a65c 100644
--- a/keyboards/machkeyboards/mach3/readme.md
+++ b/keyboards/machkeyboards/mach3/readme.md
@@ -13,7 +13,7 @@ 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
-* **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
 
 Make example for this keyboard (after setting up your build environment):