From 48792b030b754c8b3983a97071db1b09ae6353d4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 20 Aug 2022 10:31:48 +1000
Subject: Move keyboard USB IDs and strings to data driven, pass 2: handwired
 (#18079)

---
 keyboards/handwired/bento/info.json      | 17 -----------------
 keyboards/handwired/bento/rev1/config.h  |  7 -------
 keyboards/handwired/bento/rev1/info.json | 23 +++++++++++++++++++++++
 3 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 keyboards/handwired/bento/info.json
 create mode 100644 keyboards/handwired/bento/rev1/info.json

(limited to 'keyboards/handwired/bento')

diff --git a/keyboards/handwired/bento/info.json b/keyboards/handwired/bento/info.json
deleted file mode 100644
index cae2773de2..0000000000
--- a/keyboards/handwired/bento/info.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "keyboard_name": "Bento Macropad",
-  "url": "https://www.thingiverse.com/thing:4416966",
-  "maintainer": "Ghostseven",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"x":0, "y":0},
-        {"x":1, "y":0},
-        {"x":2, "y":0},
-        {"x":0, "y":1},
-        {"x":1, "y":1},
-        {"x":2, "y":1}
-      ]
-    }
-  }
-}
diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h
index 9bb7ef666d..0eb7664878 100644
--- a/keyboards/handwired/bento/rev1/config.h
+++ b/keyboards/handwired/bento/rev1/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xDAD3
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    GhostSeven
-#define PRODUCT         Bento Macropad Rev. 1
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json
new file mode 100644
index 0000000000..26aab3813a
--- /dev/null
+++ b/keyboards/handwired/bento/rev1/info.json
@@ -0,0 +1,23 @@
+{
+  "keyboard_name": "Bento Macropad Rev. 1",
+  "manufacturer": "GhostSeven",
+  "url": "https://www.thingiverse.com/thing:4416966",
+  "maintainer": "Ghostseven",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0xDAD3",
+    "device_version": "1.0.0"
+  },
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1, "y":0},
+        {"x":2, "y":0},
+        {"x":0, "y":1},
+        {"x":1, "y":1},
+        {"x":2, "y":1}
+      ]
+    }
+  }
+}
-- 
cgit v1.2.3


From bbc3bc55f2d52b90881470695ee132f5a57bfaa3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 21 Aug 2022 23:55:30 +0100
Subject: RESET -> QK_BOOT user keymaps (#17940)

---
 keyboards/handwired/bento/keymaps/mac/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/handwired/bento')

diff --git a/keyboards/handwired/bento/keymaps/mac/keymap.c b/keyboards/handwired/bento/keymaps/mac/keymap.c
index bb584c9a5b..b90c086977 100644
--- a/keyboards/handwired/bento/keymaps/mac/keymap.c
+++ b/keyboards/handwired/bento/keymaps/mac/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * ---- | Shift+CMD+B (Build VS Code) | DFU Mode
     * Shift+CMD+C (FF Console) | Ctrl+Alt+U (Upload PIO) | Ctrl+Alt+S (Serial PIO) */
     [_CODE] = LAYOUT(
-            _______, S(G(KC_B)), RESET,
+            _______, S(G(KC_B)), QK_BOOT,
             G(A(KC_C)), C(A(KC_U)), C(A(KC_S))
     ),
 };
-- 
cgit v1.2.3