Merge branch 'master' into taamas

4 files changed, 9 insertions, 11 deletions

diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h
index 9395d8ef1a..2c506e8bc2 100644
--- a/keyboards/sandwich/keeb68/config.h
+++ b/keyboards/sandwich/keeb68/config.h
@@ -19,13 +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   0x0000
-#define DEVICE_VER   0x0001
-#define MANUFACTURER sandwich
-#define PRODUCT      Keeb68 (Patron Saint Edition)
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
@@ -42,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
 #define MATRIX_COL_PINS { B6, C6, F7, E6, B7, D0, D1, D2, D3, D4, D6, D7, B4, B5 }
-#define UNUSED_PINS { D5, B0 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/sandwich/keeb68/info.json b/keyboards/sandwich/keeb68/info.json
index c6b5cb4f53..b5193a9486 100644
--- a/keyboards/sandwich/keeb68/info.json
+++ b/keyboards/sandwich/keeb68/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Keeb68 (PSE)",
+    "keyboard_name": "Keeb68 (Patron Saint Edition)",
+    "manufacturer": "sandwich",
     "url": "",
     "maintainer": "SandwichRising",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
diff --git a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
index eb5452a7c4..0a8fa898c3 100644
--- a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
+++ b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
@@ -35,6 +35,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS,
         _______, BL_TOGG, BL_DEC,  BL_BRTG, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_HOME,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, KC_END,
-        _______, RESET,   _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
+        _______, QK_BOOT, _______,                            _______,                   _______, MO(_FN), _______, _______, KC_VOLD, _______
     )
 };
diff --git a/keyboards/sandwich/keeb68/readme.md b/keyboards/sandwich/keeb68/readme.md
index 783d8f00b7..0c877fdc24 100644
--- a/keyboards/sandwich/keeb68/readme.md
+++ b/keyboards/sandwich/keeb68/readme.md
@@ -23,7 +23,7 @@ Some BIOSs may not detect keypresses properly while NRKO is enabled according to
 
 Enter the bootloader in 2 ways (all keys assume default layout):
 
-* **Keycode in layout**:  Hold Fn key and press the Windows(GUI) key (mapped to `RESET`)
+* **Keycode in layout**:  Hold Fn key and press the Windows(GUI) key (mapped to `QK_BOOT`)
 * **Physical reset button**: Briefly press the button on the back of the PCB (labeled sw1)
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).