From 20eb93e05cecb54add24ad5b69cdb1b85bb6b9e6 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Mon, 9 Oct 2023 23:16:21 +0100
Subject: [PATCH 1/4] Yampad add missing includes for CONVERT_TO (#22237)

---
 keyboards/yampad/keymaps/default/keymap.c | 1 +
 keyboards/yampad/keymaps/via/keymap.c     | 1 +
 keyboards/yampad/yampad.c                 | 1 +
 3 files changed, 3 insertions(+)

diff --git a/keyboards/yampad/keymaps/default/keymap.c b/keyboards/yampad/keymaps/default/keymap.c
index f54d4f33b07..61e6d8ff746 100644
--- a/keyboards/yampad/keymaps/default/keymap.c
+++ b/keyboards/yampad/keymaps/default/keymap.c
@@ -22,6 +22,7 @@ SOFTWARE.
 */
 
 #include QMK_KEYBOARD_H
+#include <stdio.h>
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/yampad/keymaps/via/keymap.c b/keyboards/yampad/keymaps/via/keymap.c
index f54d4f33b07..61e6d8ff746 100644
--- a/keyboards/yampad/keymaps/via/keymap.c
+++ b/keyboards/yampad/keymaps/via/keymap.c
@@ -22,6 +22,7 @@ SOFTWARE.
 */
 
 #include QMK_KEYBOARD_H
+#include <stdio.h>
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/yampad/yampad.c b/keyboards/yampad/yampad.c
index 45b0c42484c..94eac85089e 100644
--- a/keyboards/yampad/yampad.c
+++ b/keyboards/yampad/yampad.c
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "quantum.h"
+#include <stdio.h>
 
 #if defined(OLED_ENABLE)
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {

From 509a2b40b798fd79a9d78b65e4daeb78cecf17ea Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 9 Oct 2023 23:16:54 +0100
Subject: [PATCH 3/4] Fix old usage of UNICODE_MODE_MAC (#22238)

---
 docs/feature_unicode.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/feature_unicode.md b/docs/feature_unicode.md
index 341084f9260..2c6d2ef002e 100644
--- a/docs/feature_unicode.md
+++ b/docs/feature_unicode.md
@@ -140,7 +140,7 @@ To set the list of enabled input modes, add the `UNICODE_SELECTED_MODES` define
 ```c
 #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX
 // or
-#define UNICODE_SELECTED_MODES UNICODE_MODE_MAC, UNICODE_MODE_WINCOMPOSE
+#define UNICODE_SELECTED_MODES UNICODE_MODE_MACOS, UNICODE_MODE_WINCOMPOSE
 ```
 
 These modes can then be cycled through using the `UC_NEXT` and `UC_PREV` keycodes. You can also switch to any input mode, even if it is not specified in `UNICODE_SELECTED_MODES`, using their respective keycodes.
@@ -151,7 +151,7 @@ If your keyboard has working EEPROM, it will remember the last used input mode a
 
 ### ** macOS **
 
-**Mode Name:** `UNICODE_MODE_MAC`
+**Mode Name:** `UNICODE_MODE_MACOS`
 
 macOS has built-in support for Unicode input as its own input source. It supports all possible code points by way of surrogate pairs for code points above `U+FFFF`.
 

From 81d69a5798e4cebf75f7c6b5ab16c5ecb19f2ae2 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 9 Oct 2023 23:17:05 +0100
Subject: [PATCH 4/4] Resolve invalid keyboard alias targets (#22239)

---
 data/mappings/keyboard_aliases.hjson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 992564702b8..4e602b68569 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -904,10 +904,10 @@
         "target": "keychron/q0/base"
     },
     "keychron/q1": {
-        "target": "keychron/q1v1"
+        "target": "keychron/q1v1/ansi"
     }
     "keychron/q4": {
-        "target": "keychron/q4/ansi"
+        "target": "keychron/q4/ansi/v1"
     }
     "kprepublic/bm40hsrgb": {
         "target": "kprepublic/bm40hsrgb/rev1"