Merge remote-tracking branch 'origin/develop' into xap

quantum/action_util.c: Use uint8_t for oneshot_layer_data (#20423 )
2025-07-22 07:32:02 +00:00 · 2023-04-12 14:24:49 +00:00 · 2023-04-12 07:24:07 -07:00 · 2023-04-12 14:23:08 +00:00 · 2023-04-12 07:22:07 -07:00 · 2023-04-12 10:12:23 +00:00
3 changed files with 4 additions and 4 deletions
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ b/keyboards/keychron/q1/ansi_encoder/info.json
@ -39,8 +39,8 @@
                {"matrix":[0,11], "x":10.75, "y":0},
                {"matrix":[0,12], "x":11.75, "y":0},
                {"matrix":[0,13], "x":12.75, "y":0},
-                {"matrix":[0,14], "x":14, "y":0},
-                {"matrix":[4,14], "x":15.25, "y":0},
+                {"matrix":[4,14], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},

                {"matrix":[1, 0], "x":0, "y":1},
                {"matrix":[1, 1], "x":1, "y":1},
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@ -90,7 +90,7 @@ bool has_oneshot_mods_timed_out(void) {
 *   L => are layer bits
 *   S => oneshot state bits
 */
-static int8_t oneshot_layer_data = 0;
+static uint8_t oneshot_layer_data = 0;

 inline uint8_t get_oneshot_layer(void) {
    return oneshot_layer_data >> 3;
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@ -213,7 +213,7 @@ typedef struct _split_shared_memory_t {
    bool watchdog_pinged;
 #endif // defined(SPLIT_WATCHDOG_ENABLE)

-#if defined(HAPTIC_ENABLE)
+#if defined(HAPTIC_ENABLE) && defined(SPLIT_HAPTIC_ENABLE)
    split_slave_haptic_sync_t haptic_sync;
 #endif // defined(HAPTIC_ENABLE)
Author	SHA1	Message	Date
QMK Bot	668980b670	Merge remote-tracking branch 'origin/develop' into xap	2023-04-12 14:24:49 +00:00
Manuel Ullmann	1502193181	quantum/action_util.c: Use uint8_t for oneshot_layer_data (#20423 )	2023-04-12 07:24:07 -07:00
QMK Bot	1653df76d9	Merge remote-tracking branch 'origin/develop' into xap	2023-04-12 14:23:08 +00:00
Giuseppe Rota	e77699a58a	Fix preprocessor condition for SPLIT_HAPTIC_ENABLE (#20411 )	2023-04-12 07:22:07 -07:00
QMK Bot	d28a0e019b	Merge remote-tracking branch 'origin/develop' into xap	2023-04-12 10:12:23 +00:00
QMK Bot	e699724645	Merge remote-tracking branch 'origin/master' into develop	2023-04-12 10:11:37 +00:00
Mike Killewald	75edefe541	fixing bug that caused KC_DEL and KC_MUTE (encoder press) to be swapped (#20420 )	2023-04-12 11:10:50 +01:00