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

4 files changed, 17 insertions, 16 deletions

diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index 99ce9e85db..7429845958 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -1,8 +1,5 @@
 #pragma once
 
-/* USB Device descriptor parameter */
-#define DEVICE_VER 0x2019
-
 #undef MATRIX_ROWS
 #undef MATRIX_COLS
 /* key matrix size */
diff --git a/keyboards/boston_meetup/2019/info.json b/keyboards/boston_meetup/2019/info.json
index 53beef5a84..5f8f8c95f7 100644
--- a/keyboards/boston_meetup/2019/info.json
+++ b/keyboards/boston_meetup/2019/info.json
@@ -1,9 +1,5 @@
 {
-  "keyboard_name": "Boston Meetup 2019", 
-  "url": "", 
-  "maintainer": "qmk", 
-  "layouts": {
-    "LAYOUT": {
- "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}]    }
-  }
+    "usb": {
+        "device_version": "20.1.9"
+    }
 }
diff --git a/keyboards/boston_meetup/config.h b/keyboards/boston_meetup/config.h
index 60e490435f..8e9919c23a 100644
--- a/keyboards/boston_meetup/config.h
+++ b/keyboards/boston_meetup/config.h
@@ -19,12 +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       0xFB30
-#define PRODUCT_ID      0x26BE
-#define MANUFACTURER    ishtob
-#define PRODUCT         Boston Meetup Board
-
 //#define AUDIO_VOICES
 
 //#define BACKLIGHT_PIN B7
diff --git a/keyboards/boston_meetup/info.json b/keyboards/boston_meetup/info.json
new file mode 100644
index 0000000000..2c25d4ff06
--- /dev/null
+++ b/keyboards/boston_meetup/info.json
@@ -0,0 +1,14 @@
+{
+  "keyboard_name": "Boston Meetup Board", 
+  "manufacturer": "ishtob",
+  "url": "", 
+  "maintainer": "qmk", 
+  "usb": {
+    "vid": "0xFB30",
+    "pid": "0x26BE"
+  },
+  "layouts": {
+    "LAYOUT": {
+ "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "x":3, "y":3}]    }
+  }
+}