merge upstream 713427c

16 files changed, 13 insertions, 15 deletions

diff --git a/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c
index ca92d5e5f1..ca92d5e5f1 100755..100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/config.h b/keyboards/keychron/q2_pro/ansi_encoder/config.h
index 9349e263bc..9349e263bc 100755..100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/config.h
+++ b/keyboards/keychron/q2_pro/ansi_encoder/config.h
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/info.json b/keyboards/keychron/q2_pro/ansi_encoder/info.json
index ef13b35f73..ef13b35f73 100755..100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/info.json
+++ b/keyboards/keychron/q2_pro/ansi_encoder/info.json
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c
index aa51c14c72..f8ad9414fb 100755..100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT,  KC_DOWN, KC_RGHT),
 
     [MAC_FN1] = LAYOUT_ansi_knob_67(
-        KC_GRV,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LNPD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,            RGB_TOG,
+        KC_GRV,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,            RGB_TOG,
         _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
         _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  NK_TOGG,  _______,  _______,  _______,  _______,                      _______,  _______,
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/rules.mk
index ee32568148..ee32568148 100755..100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/rules.mk
+++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/rules.mk
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c
index 042586ad94..7dbd727462 100755..100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT,  KC_DOWN, KC_RGHT),
 
     [MAC_FN1] = LAYOUT_ansi_knob_67(
-        KC_GRV,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LNPD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,            RGB_TOG,
+        KC_GRV,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,            RGB_TOG,
         _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
         _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  NK_TOGG,  _______,  _______,  _______,  _______,                      _______,  _______,
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk
index b8562c8f4e..b8562c8f4e 100755..100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk
diff --git a/keyboards/keychron/q2_pro/ansi_encoder/rules.mk b/keyboards/keychron/q2_pro/ansi_encoder/rules.mk
index 4f20668f49..4f20668f49 100755..100644
--- a/keyboards/keychron/q2_pro/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q2_pro/ansi_encoder/rules.mk
diff --git a/keyboards/keychron/q2_pro/config.h b/keyboards/keychron/q2_pro/config.h
index 2a76577c05..2a76577c05 100755..100644
--- a/keyboards/keychron/q2_pro/config.h
+++ b/keyboards/keychron/q2_pro/config.h
diff --git a/keyboards/keychron/q2_pro/halconf.h b/keyboards/keychron/q2_pro/halconf.h
index ec9590127c..8d8e138e4e 100755..100644
--- a/keyboards/keychron/q2_pro/halconf.h
+++ b/keyboards/keychron/q2_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/q2_pro/matrix.c b/keyboards/keychron/q2_pro/matrix.c
index c6710b22d5..c6710b22d5 100755..100644
--- a/keyboards/keychron/q2_pro/matrix.c
+++ b/keyboards/keychron/q2_pro/matrix.c
diff --git a/keyboards/keychron/q2_pro/mcuconf.h b/keyboards/keychron/q2_pro/mcuconf.h
index b33ceb18b2..b33ceb18b2 100755..100644
--- a/keyboards/keychron/q2_pro/mcuconf.h
+++ b/keyboards/keychron/q2_pro/mcuconf.h
diff --git a/keyboards/keychron/q2_pro/q2_pro.c b/keyboards/keychron/q2_pro/q2_pro.c
index 38fee0566f..6d94998138 100755..100644
--- a/keyboards/keychron/q2_pro/q2_pro.c
+++ b/keyboards/keychron/q2_pro/q2_pro.c
@@ -86,14 +86,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/q2_pro/q2_pro.h b/keyboards/keychron/q2_pro/q2_pro.h
index 8b1520bbb3..0e15df4e45 100755..100644
--- a/keyboards/keychron/q2_pro/q2_pro.h
+++ b/keyboards/keychron/q2_pro/q2_pro.h
@@ -22,18 +22,17 @@
 #endif
 
 #ifdef VIA_ENABLE
-#    define USER_START USER00
+#    define USER_START QK_KB_0
 #else
 #    define USER_START SAFE_RANGE
 #endif
 
+// clang-format off
 enum {
     KC_LOPTN = USER_START,
     KC_ROPTN,
     KC_LCMMD,
     KC_RCMMD,
-    KC_MCTL,
-    KC_LNPD,
     KC_TASK,
     KC_FILE,
     KC_SNAP,
@@ -43,7 +42,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/q2_pro/readme.md b/keyboards/keychron/q2_pro/readme.md
index f46a26f308..f46a26f308 100755..100644
--- a/keyboards/keychron/q2_pro/readme.md
+++ b/keyboards/keychron/q2_pro/readme.md
diff --git a/keyboards/keychron/q2_pro/rules.mk b/keyboards/keychron/q2_pro/rules.mk
index 0824dfed8b..0824dfed8b 100755..100644
--- a/keyboards/keychron/q2_pro/rules.mk
+++ b/keyboards/keychron/q2_pro/rules.mk