Merge remote-tracking branch 'qmk/master' into merge-2022-09-10

keyboards/cablecardesigns/cypher/rev6/config.h

@@ -4,20 +4,12 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x41FF
-#define PRODUCT_ID      0xAA99
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    cablecardesigns
-#define PRODUCT         cypher
-
 /* key matrix size */
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 10
 
 #define MATRIX_ROW_PINS { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
 #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
 #define DIODE_DIRECTION COL2ROW

keyboards/cablecardesigns/cypher/rev6/info.json

@@ -1,5 +1,11 @@
 {
     "keyboard_name": "Cypher Rev6",
+    "manufacturer": "cablecardesigns",
+    "usb": {
+      "vid": "0x41FF",
+      "pid": "0xAA99",
+      "device_version": "0.0.2"
+    },
     "layouts": {
       "LAYOUT_all": {
         "layout": [

keyboards/cablecardesigns/cypher/rev6/readme.md

@@ -22,4 +22,4 @@ 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**: There are 2 holes underneath the spacebar position that if shorted will enter bootloader
-* **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