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

keyboards/maple_computing/christmas_tree/V2017/config.h

@@ -1,5 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-#define DEVICE_VER 0x2017

keyboards/maple_computing/christmas_tree/V2017/info.json

@@ -0,0 +1,5 @@
+{
+    "usb": {
+        "device_version": "20.1.7"
+    }
+}

keyboards/maple_computing/christmas_tree/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       0xFEED
-#define PRODUCT_ID      0x3070
-#define MANUFACTURER    Maple Computing
-#define PRODUCT         Christmas Tree
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 1

keyboards/maple_computing/christmas_tree/info.json

@@ -1,7 +1,12 @@
 {
   "keyboard_name": "Christmas Tree",
+  "manufacturer": "Maple Computing",
   "url": "https://www.reddit.com/r/MechanicalKeyboards/comments/7cqxpf/gb_christmas_tree_pcb_gb_now_live/",
   "maintainer": "That-Canadian",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x3070"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"x":1, "y":0}, {"x":0.5, "y":1}, {"x":1.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}]