From 674422eb13a4f5c9c8238629e42f4fc1d7641ede Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 26 Jul 2022 10:52:18 +1000
Subject: Move keyboard USB IDs and strings to data driven: A (#17781)

---
 keyboards/aves60/config.h  | 7 -------
 keyboards/aves60/info.json | 8 +++++++-
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'keyboards/aves60')

diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index d44951a4ce..7783cc9120 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x9991
-#define PRODUCT_ID      0xD408
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    I/O Keyboards
-#define PRODUCT         Aves 60
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
index f921de058a..6d1c7f4e37 100644
--- a/keyboards/aves60/info.json
+++ b/keyboards/aves60/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Aves60",
+    "keyboard_name": "Aves 60",
+    "manufacturer": "I/O Keyboards",
     "url": "https://iokeyboards.eu/",
     "maintainer": "evyd13",
+    "usb": {
+        "vid": "0x9991",
+        "pid": "0xD408",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-- 
cgit v1.2.1


From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 6 Aug 2022 23:23:35 +1000
Subject: Remove `UNUSED_PINS` (#17931)

---
 keyboards/aves60/config.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'keyboards/aves60')

diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index 7783cc9120..8e59e88d83 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -21,7 +21,6 @@
  */
 #define MATRIX_ROW_PINS { F6, F7, F5, F1, F4 }
 #define MATRIX_COL_PINS { B2, B3, D0, D1, D2, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS { B0, B7, E6, F0 }
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-- 
cgit v1.2.1


From d2accb48e784030637f5517dfec66b13f1eab609 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 20 Aug 2022 11:34:17 +0100
Subject: RESET -> QK_BOOT keyboard readme (#18110)

---
 keyboards/aves60/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keyboards/aves60')

diff --git a/keyboards/aves60/readme.md b/keyboards/aves60/readme.md
index 5a96d2b2eb..049d2d99d8 100644
--- a/keyboards/aves60/readme.md
+++ b/keyboards/aves60/readme.md
@@ -24,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the space bar and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB
-* **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
-- 
cgit v1.2.1