poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
QMK Bot 2021-02-05 13:28:01 +00:00
commit b4e02f8ddf
3 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
quantum/pointing_device.c
View file

@ -25,14 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
static report_mouse_t mouseReport = {}; static report_mouse_t mouseReport = {};
__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) { __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); }
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) { __attribute__((weak)) void pointing_device_init(void) {
// initialize device, if that needs to be done. // initialize device, if that needs to be done.
@ -50,7 +43,7 @@ __attribute__((weak)) void pointing_device_send(void) {
mouseReport.y = 0; mouseReport.y = 0;
mouseReport.v = 0; mouseReport.v = 0;
mouseReport.h = 0; mouseReport.h = 0;
old_report = mouseReport; old_report = mouseReport;
} }
__attribute__((weak)) void pointing_device_task(void) { __attribute__((weak)) void pointing_device_task(void) {

4
quantum/quantum.c
View file

@ -744,9 +744,7 @@ void send_byte(uint8_t number) {
send_nibble(number & 0xF); send_nibble(number & 0xF);
} }
void send_nibble(uint8_t number) { void send_nibble(uint8_t number) { tap_code16(hex_to_keycode(number)); }
tap_code16(hex_to_keycode(number));
}
__attribute__((weak)) uint16_t hex_to_keycode(uint8_t hex) { __attribute__((weak)) uint16_t hex_to_keycode(uint8_t hex) {
hex = hex & 0xF; hex = hex & 0xF;

12
tmk_core/common/keyboard.c
View file

@ -113,8 +113,8 @@ void last_encoder_activity_trigger(void) { last_encoder_modification_
// Only enable this if console is enabled to print to // Only enable this if console is enabled to print to
#if defined(DEBUG_MATRIX_SCAN_RATE) #if defined(DEBUG_MATRIX_SCAN_RATE)
static uint32_t matrix_timer = 0; static uint32_t matrix_timer = 0;
static uint32_t matrix_scan_count = 0; static uint32_t matrix_scan_count = 0;
static uint32_t last_matrix_scan_count = 0; static uint32_t last_matrix_scan_count = 0;
void matrix_scan_perf_task(void) { 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); dprintf("matrix scan frequency: %lu\n", matrix_scan_count);
# endif # endif
last_matrix_scan_count = matrix_scan_count; last_matrix_scan_count = matrix_scan_count;
matrix_timer = timer_now; matrix_timer = timer_now;
matrix_scan_count = 0; matrix_scan_count = 0;
} }
} }
uint32_t get_matrix_scan_rate(void) { uint32_t get_matrix_scan_rate(void) { return last_matrix_scan_count; }
return last_matrix_scan_count;
}
#else #else
# define matrix_scan_perf_task() # define matrix_scan_perf_task()
#endif #endif