diff options
| -rw-r--r-- | quantum/pointing_device.c | 11 | ||||
| -rw-r--r-- | quantum/quantum.c | 4 | ||||
| -rw-r--r-- | tmk_core/common/keyboard.c | 12 |
3 files changed, 8 insertions, 19 deletions
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c index fbcc08e6dd..09d889f697 100644 --- a/quantum/pointing_device.c +++ b/quantum/pointing_device.c @@ -25,14 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. static report_mouse_t mouseReport = {}; -__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) { - return (new.buttons != old.buttons) || - (new.x && new.x != old.x) || - (new.y && new.y != old.y) || - (new.h && new.h != old.h) || - (new.v && new.v != old.v); -} - +__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) { return (new.buttons != old.buttons) || (new.x&& new.x != old.x) || (new.y&& new.y != old.y) || (new.h&& new.h != old.h) || (new.v&& new.v != old.v); } __attribute__((weak)) void pointing_device_init(void) { // initialize device, if that needs to be done. @@ -50,7 +43,7 @@ __attribute__((weak)) void pointing_device_send(void) { mouseReport.y = 0; mouseReport.v = 0; mouseReport.h = 0; - old_report = mouseReport; + old_report = mouseReport; } __attribute__((weak)) void pointing_device_task(void) { diff --git a/quantum/quantum.c b/quantum/quantum.c index 5e0cde8a25..8ae487bec2 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -744,9 +744,7 @@ void send_byte(uint8_t number) { send_nibble(number & 0xF); } -void send_nibble(uint8_t number) { - tap_code16(hex_to_keycode(number)); -} +void send_nibble(uint8_t number) { tap_code16(hex_to_keycode(number)); } __attribute__((weak)) uint16_t hex_to_keycode(uint8_t hex) { hex = hex & 0xF; diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c index 61b6674f90..40989ca4c6 100644 --- a/tmk_core/common/keyboard.c +++ b/tmk_core/common/keyboard.c @@ -113,8 +113,8 @@ void last_encoder_activity_trigger(void) { last_encoder_modification_ // Only enable this if console is enabled to print to #if defined(DEBUG_MATRIX_SCAN_RATE) -static uint32_t matrix_timer = 0; -static uint32_t matrix_scan_count = 0; +static uint32_t matrix_timer = 0; +static uint32_t matrix_scan_count = 0; static uint32_t last_matrix_scan_count = 0; void matrix_scan_perf_task(void) { @@ -126,14 +126,12 @@ void matrix_scan_perf_task(void) { dprintf("matrix scan frequency: %lu\n", matrix_scan_count); # endif last_matrix_scan_count = matrix_scan_count; - matrix_timer = timer_now; - matrix_scan_count = 0; + matrix_timer = timer_now; + matrix_scan_count = 0; } } -uint32_t get_matrix_scan_rate(void) { - return last_matrix_scan_count; -} +uint32_t get_matrix_scan_rate(void) { return last_matrix_scan_count; } #else # define matrix_scan_perf_task() #endif |