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

2022-08-20 10:55:40 +10:00
parent eceed6c50b 201f1a8f47
commit 61689ae609
550 changed files with 1689 additions and 1819 deletions
--- a/keyboards/neson_design/700e/config.h
+++ b/keyboards/neson_design/700e/config.h
@@ -20,13 +20,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4E65   //'Ne'
-#define PRODUCT_ID      0x700E   //
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Neson Design
-#define PRODUCT         700E Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
--- a/keyboards/neson_design/700e/info.json
+++ b/keyboards/neson_design/700e/info.json
@@ -1,7 +1,13 @@
 {
    "keyboard_name": "700E",
+    "manufacturer": "Neson Design",
    "url": "",
    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4E65",
+        "pid": "0x700E",
+        "device_version": "0.0.1"
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout":