From aac45148656197a04f9b7e52eb4e18d12083986a Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Thu, 16 Oct 2025 20:34:40 +0700 Subject: [PATCH 1/2] fix(automouse): prevent non mouse key to leave the automouse layer --- quantum/pointing_device/pointing_device_auto_mouse.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/quantum/pointing_device/pointing_device_auto_mouse.c b/quantum/pointing_device/pointing_device_auto_mouse.c index 3cfb0ed464..c1f4c9f668 100644 --- a/quantum/pointing_device/pointing_device_auto_mouse.c +++ b/quantum/pointing_device/pointing_device_auto_mouse.c @@ -320,9 +320,6 @@ void auto_mouse_reset_trigger(bool pressed) { #ifdef LAYER_LOCK_ENABLE if(is_layer_locked(AUTO_MOUSE_DEFAULT_LAYER)) return; #endif - if (layer_state_is((AUTO_MOUSE_TARGET_LAYER))) { - layer_off((AUTO_MOUSE_TARGET_LAYER)); - }; auto_mouse_reset(); } auto_mouse_context.timer.delay = timer_read(); From 846852964826cf6d0fa37b2a26593c67dd7e4ac1 Mon Sep 17 00:00:00 2001 From: Florian Didron Date: Thu, 16 Oct 2025 21:12:27 +0700 Subject: [PATCH 2/2] fix(right-side-recover): force solid color to properly reset when recovering the right side --- keyboards/zsa/moonlander/matrix.c | 4 ++++ keyboards/zsa/voyager/matrix.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/keyboards/zsa/moonlander/matrix.c b/keyboards/zsa/moonlander/matrix.c index 26bb34ae65..f963170041 100644 --- a/keyboards/zsa/moonlander/matrix.c +++ b/keyboards/zsa/moonlander/matrix.c @@ -105,6 +105,10 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { mcp23018_errors = mcp23018_init_local(false); #ifdef RGB_MATRIX_ENABLE rgb_matrix_init(); + // Required to recover the solid color mode + if (rgb_matrix_get_mode() == 1) { + rgb_matrix_set_color_all(255, 255, 255); + } #endif } } diff --git a/keyboards/zsa/voyager/matrix.c b/keyboards/zsa/voyager/matrix.c index b05313a033..c08c9e07bc 100644 --- a/keyboards/zsa/voyager/matrix.c +++ b/keyboards/zsa/voyager/matrix.c @@ -92,6 +92,10 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) { mcp23018_errors = mcp23018_init_local(false); #ifdef RGB_MATRIX_ENABLE rgb_matrix_init(); + // Required to recover the solid color mode + if (rgb_matrix_get_mode() == 1) { + rgb_matrix_set_color_all(255, 255, 255); + } #endif } }