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

2022-08-15 17:54:07 +10:00
parent 8e9ee29fe3 51d5aad25b
commit c202602938
170 changed files with 508 additions and 750 deletions
--- a/keyboards/flehrad/numbrero/config.h
+++ b/keyboards/flehrad/numbrero/config.h
@@ -2,13 +2,6 @@

 #include "config_common.h"

-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Flehrad
-#define PRODUCT         Numbrero
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 5
--- a/keyboards/flehrad/numbrero/info.json
+++ b/keyboards/flehrad/numbrero/info.json
@@ -1,7 +1,13 @@
 {
  "keyboard_name": "Numbrero",
+  "manufacturer": "Flehrad",
  "url": "",
  "maintainer": "Flehrad",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
  "layouts": {
    "LAYOUT_numbrero_numpad": {
      "layout": [