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/trackpad

Browse Source
This commit is contained in:
Florian Didron
2025-10-21 18:20:44 +07:00
parent 86f067215e d0d9424e7e
commit f7be5a3f53
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
keyboards/zsa/moonlander/config.h
View File

@@ -37,3 +37,4 @@
#define AUDIO_PIN A5
#define AUDIO_PIN_ALT A4
#define AUDIO_PIN_ALT_AS_NEGATIVE
#define AUDIO_INIT_DELAY 100

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

@@ -105,6 +105,9 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
mcp23018_errors = mcp23018_init_local(false);
#ifdef RGB_MATRIX_ENABLE
rgb_matrix_init();
if (rgb_matrix_get_mode() == 1 && keyboard_config.rgb_matrix_enable) {
rgb_matrix_set_color_all(0, 0, 0);
}
#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_is_enabled()) {
rgb_matrix_set_color_all(255, 255, 255);
}
#endif
}
}

15
quantum/pointing_device/pointing_device_auto_mouse.c
View File

@@ -250,7 +250,7 @@ __attribute__((weak)) bool auto_mouse_activation(report_mouse_t mouse_report) {
auto_mouse_context.total_mouse_movement.y += mouse_report.y;
auto_mouse_context.total_mouse_movement.h += mouse_report.h;
auto_mouse_context.total_mouse_movement.v += mouse_report.v;
return abs(auto_mouse_context.total_mouse_movement.x) > AUTO_MOUSE_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.y) > AUTO_MOUSE_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.h) > AUTO_MOUSE_SCROLL_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.v) > AUTO_MOUSE_SCROLL_THRESHOLD || mouse_report.buttons;
return abs(auto_mouse_context.total_mouse_movement.x) > AUTO_MOUSE_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.y) > AUTO_MOUSE_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.h) > AUTO_MOUSE_SCROLL_THRESHOLD || abs(auto_mouse_context.total_mouse_movement.v) > AUTO_MOUSE_SCROLL_THRESHOLD || (mouse_report.buttons && layer_state_is(AUTO_MOUSE_TARGET_LAYER));
}
/**
@@ -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();
@@ -430,7 +427,7 @@ bool process_auto_mouse(uint16_t keycode, keyrecord_t* record) {
// skip on no event
if (IS_NOEVENT(record->event)) break;
// check if keyrecord is mousekey
if (is_mouse_record(keycode, record)) {
if (is_mouse_record(keycode, record) && is_auto_mouse_active()) {
auto_mouse_keyevent(record->event.pressed);
} else if (!is_auto_mouse_active()) {
// all non-mousekey presses restart delay timer and reset status
@@ -462,13 +459,7 @@ bool process_auto_mouse(uint16_t keycode, keyrecord_t* record) {
*/
static bool is_mouse_record(uint16_t keycode, keyrecord_t* record) {
// allow for keyboard to hook in and override if need be
if (is_mouse_record_kb(keycode, record)) return true;
// if it's a mouse key, only treat it as a mouse record if we're currently on the auto mouse target layer
// this prevents mouse keys from activating the auto mouse layer when pressed on other layers
if (IS_MOUSEKEY(keycode)) {
return layer_state_is((AUTO_MOUSE_TARGET_LAYER));
}
if ((is_mouse_record_kb(keycode, record) || IS_MOUSEKEY(keycode))) return true;
return false;
}