merge upstream 713427c

24 files changed, 16 insertions, 23 deletions

diff --git a/keyboards/keychron/k5_pro/ansi/rgb/config.h b/keyboards/keychron/k5_pro/ansi/rgb/config.h
index 83294b9d52..83294b9d52 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k5_pro/ansi/rgb/config.h
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/info.json b/keyboards/keychron/k5_pro/ansi/rgb/info.json
index 7cf7341733..7cf7341733 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k5_pro/ansi/rgb/info.json
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/default/keymap.c
index c34da595a4..04c056a00e 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/default/keymap.c
+++ b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [MAC_BASE] = LAYOUT_ansi_108(
-    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LNPD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU, KC_SNAP,  KC_SIRI,  RGB_MOD, KC_F13,  KC_F14,  KC_F15,  KC_F16,
+    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU, KC_SNAP,  KC_SIRI,  RGB_MOD, KC_F13,  KC_F14,  KC_F15,  KC_F16,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_INS,   KC_HOME,  KC_PGUP, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_DEL,   KC_END,   KC_PGDN, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,                               KC_P4,   KC_P5,   KC_P6,
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/keymap.c
index c34da595a4..04c056a00e 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/keymap.c
+++ b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [MAC_BASE] = LAYOUT_ansi_108(
-    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LNPD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU, KC_SNAP,  KC_SIRI,  RGB_MOD, KC_F13,  KC_F14,  KC_F15,  KC_F16,
+    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU, KC_SNAP,  KC_SIRI,  RGB_MOD, KC_F13,  KC_F14,  KC_F15,  KC_F16,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_INS,   KC_HOME,  KC_PGUP, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_DEL,   KC_END,   KC_PGDN, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,                               KC_P4,   KC_P5,   KC_P6,
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/rules.mk b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/rules.mk
index 45fa68954c..45fa68954c 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/rules.mk
+++ b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/rules.mk
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/rgb.c b/keyboards/keychron/k5_pro/ansi/rgb/rgb.c
index f20c3d1e97..f20c3d1e97 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/k5_pro/ansi/rgb/rgb.c
diff --git a/keyboards/keychron/k5_pro/ansi/rgb/rules.mk b/keyboards/keychron/k5_pro/ansi/rgb/rules.mk
index 7af34ccd60..7af34ccd60 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/rgb/rules.mk
+++ b/keyboards/keychron/k5_pro/ansi/rgb/rules.mk
diff --git a/keyboards/keychron/k5_pro/ansi/white/config.h b/keyboards/keychron/k5_pro/ansi/white/config.h
index 3c2d99a4cf..3c2d99a4cf 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/white/config.h
+++ b/keyboards/keychron/k5_pro/ansi/white/config.h
diff --git a/keyboards/keychron/k5_pro/ansi/white/info.json b/keyboards/keychron/k5_pro/ansi/white/info.json
index a9df1baa6a..a9df1baa6a 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/white/info.json
+++ b/keyboards/keychron/k5_pro/ansi/white/info.json
diff --git a/keyboards/keychron/k5_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/k5_pro/ansi/white/keymaps/default/keymap.c
index 6c1088ea9d..906d8d8b86 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/k5_pro/ansi/white/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [MAC_BASE] = LAYOUT_ansi_108(
-    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LNPD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU, KC_SNAP,  KC_SIRI,  BL_STEP, KC_F13,  KC_F14,  KC_F15,  KC_F16,
+    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU, KC_SNAP,  KC_SIRI,  BL_STEP, KC_F13,  KC_F14,  KC_F15,  KC_F16,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_INS,   KC_HOME,  KC_PGUP, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_DEL,   KC_END,   KC_PGDN, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,                               KC_P4,   KC_P5,   KC_P6,
diff --git a/keyboards/keychron/k5_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/k5_pro/ansi/white/keymaps/via/keymap.c
index 6c1088ea9d..906d8d8b86 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/k5_pro/ansi/white/keymaps/via/keymap.c
@@ -26,7 +26,7 @@ enum layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [MAC_BASE] = LAYOUT_ansi_108(
-    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LNPD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU, KC_SNAP,  KC_SIRI,  BL_STEP, KC_F13,  KC_F14,  KC_F15,  KC_F16,
+    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU, KC_SNAP,  KC_SIRI,  BL_STEP, KC_F13,  KC_F14,  KC_F15,  KC_F16,
     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC, KC_INS,   KC_HOME,  KC_PGUP, KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS, KC_DEL,   KC_END,   KC_PGDN, KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,                               KC_P4,   KC_P5,   KC_P6,
diff --git a/keyboards/keychron/k5_pro/ansi/white/keymaps/via/rules.mk b/keyboards/keychron/k5_pro/ansi/white/keymaps/via/rules.mk
index 45fa68954c..45fa68954c 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/white/keymaps/via/rules.mk
+++ b/keyboards/keychron/k5_pro/ansi/white/keymaps/via/rules.mk
diff --git a/keyboards/keychron/k5_pro/ansi/white/rules.mk b/keyboards/keychron/k5_pro/ansi/white/rules.mk
index 290c1bb47a..290c1bb47a 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/white/rules.mk
+++ b/keyboards/keychron/k5_pro/ansi/white/rules.mk
diff --git a/keyboards/keychron/k5_pro/ansi/white/white.c b/keyboards/keychron/k5_pro/ansi/white/white.c
index 214f7a4238..214f7a4238 100755..100644
--- a/keyboards/keychron/k5_pro/ansi/white/white.c
+++ b/keyboards/keychron/k5_pro/ansi/white/white.c
diff --git a/keyboards/keychron/k5_pro/config.h b/keyboards/keychron/k5_pro/config.h
index 02bb3f3aa2..02bb3f3aa2 100755..100644
--- a/keyboards/keychron/k5_pro/config.h
+++ b/keyboards/keychron/k5_pro/config.h
diff --git a/keyboards/keychron/k5_pro/halconf.h b/keyboards/keychron/k5_pro/halconf.h
index fafd0c1fed..306f917783 100755..100644
--- a/keyboards/keychron/k5_pro/halconf.h
+++ b/keyboards/keychron/k5_pro/halconf.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#define _CHIBIOS_HAL_CONF_VER_8_0_
+
 #define HAL_USE_I2C TRUE
 
 #ifdef KC_BLUETOOTH_ENABLE
diff --git a/keyboards/keychron/k5_pro/k5_pro.c b/keyboards/keychron/k5_pro/k5_pro.c
index 42940fff2b..f86f054944 100755..100644
--- a/keyboards/keychron/k5_pro/k5_pro.c
+++ b/keyboards/keychron/k5_pro/k5_pro.c
@@ -91,14 +91,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 unregister_code(mac_keycode[keycode - KC_LOPTN]);
             }
             return false; // Skip all further processing of this key)
-        case KC_MCTL:
-            /* Mission Control */
-            host_consumer_send(record->event.pressed ? 0x29F : 0);
-            return false; // Skip all further processing of this key
-        case KC_LNPD:
-            /* Lanuchpad */
-            host_consumer_send(record->event.pressed ? 0x2A0 : 0);
-            return false; // Skip all further processing of this key
         case KC_TASK:
         case KC_FILE:
         case KC_SNAP:
diff --git a/keyboards/keychron/k5_pro/k5_pro.h b/keyboards/keychron/k5_pro/k5_pro.h
index c7e29d5afb..cd0954d579 100755..100644
--- a/keyboards/keychron/k5_pro/k5_pro.h
+++ b/keyboards/keychron/k5_pro/k5_pro.h
@@ -18,15 +18,15 @@
 
 #include "quantum.h"
 #ifdef VIA_ENABLE
-#include "via.h"
+#    include "via.h"
 #endif
 
 #define ___ KC_NO
 
 #ifdef VIA_ENABLE
-#define USER_START  USER00
+#    define USER_START QK_KB_0
 #else
-#define USER_START  SAFE_RANGE
+#    define USER_START SAFE_RANGE
 #endif
 
 // clang-format off
@@ -35,8 +35,6 @@ enum {
     KC_ROPTN,
     KC_LCMMD,
     KC_RCMMD,
-    KC_MCTL,
-    KC_LNPD,
     KC_TASK,
     KC_FILE,
     KC_SNAP,
@@ -46,7 +44,12 @@ enum {
     BT_HST1,
     BT_HST2,
     BT_HST3,
-#endif
     BAT_LVL,
-    NEW_SAFE_RANGE,
+#else
+    BT_HST1 = KC_TRNS,
+    BT_HST2 = KC_TRNS,
+    BT_HST3 = KC_TRNS,
+    BAT_LVL = KC_TRNS,
+#endif
+	NEW_SAFE_RANGE
 };
diff --git a/keyboards/keychron/k5_pro/matrix.c b/keyboards/keychron/k5_pro/matrix.c
index 3b422d9d2b..3b422d9d2b 100755..100644
--- a/keyboards/keychron/k5_pro/matrix.c
+++ b/keyboards/keychron/k5_pro/matrix.c
diff --git a/keyboards/keychron/k5_pro/mcuconf.h b/keyboards/keychron/k5_pro/mcuconf.h
index 4dae767a44..4dae767a44 100755..100644
--- a/keyboards/keychron/k5_pro/mcuconf.h
+++ b/keyboards/keychron/k5_pro/mcuconf.h
diff --git a/keyboards/keychron/k5_pro/readme.md b/keyboards/keychron/k5_pro/readme.md
index a53b180b5e..a53b180b5e 100755..100644
--- a/keyboards/keychron/k5_pro/readme.md
+++ b/keyboards/keychron/k5_pro/readme.md
diff --git a/keyboards/keychron/k5_pro/rules.mk b/keyboards/keychron/k5_pro/rules.mk
index 1de119ff73..1de119ff73 100755..100644
--- a/keyboards/keychron/k5_pro/rules.mk
+++ b/keyboards/keychron/k5_pro/rules.mk
diff --git a/keyboards/keychron/k5_pro/via_json/k5_pro_ansi_rgb_v1.00.json b/keyboards/keychron/k5_pro/via_json/k5_pro_ansi_rgb_v1.00.json
index 7528f32040..67be2b79eb 100755..100644
--- a/keyboards/keychron/k5_pro/via_json/k5_pro_ansi_rgb_v1.00.json
+++ b/keyboards/keychron/k5_pro/via_json/k5_pro_ansi_rgb_v1.00.json
@@ -69,8 +69,6 @@
     {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
     {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"},
     {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"},
-    {"name": "Misson Control", "title": "Misson Control, availabe in macOS", "shortName": "MCtrl"},
-    {"name": "Launch pad", "title": "Launch pad, availabe in macOS", "shortName": "LPad"},
     {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"},
     {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"},
     {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"},
diff --git a/keyboards/keychron/k5_pro/via_json/k5_pro_ansi_white_v1.00.json b/keyboards/keychron/k5_pro/via_json/k5_pro_ansi_white_v1.00.json
index 75db3294af..a6bef8e08e 100755..100644
--- a/keyboards/keychron/k5_pro/via_json/k5_pro_ansi_white_v1.00.json
+++ b/keyboards/keychron/k5_pro/via_json/k5_pro_ansi_white_v1.00.json
@@ -8,8 +8,6 @@
     {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
     {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"},
     {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"},
-    {"name": "Misson Control", "title": "Misson Control, availabe in macOS", "shortName": "MCtrl"},
-    {"name": "Launch pad", "title": "Launch pad, availabe in macOS", "shortName": "LPad"},
     {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"},
     {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"},
     {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"},