melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-01-09 15:12:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'firmware25' into feat/moonlander-revb

Browse Source
This commit is contained in:
Florian Didron
2025-10-16 21:12:34 +07:00
parent 731ee0218f 8468529648
commit b6a5bb55f1
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keyboards/zsa/moonlander/matrix.c
View File

@@ -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
}
}

4
keyboards/zsa/voyager/matrix.c
View File

@@ -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
}
}

3
quantum/pointing_device/pointing_device_auto_mouse.c
View File

@@ -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();