Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
b4e02f8ddf
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -131,9 +131,7 @@ void matrix_scan_perf_task(void) {
|
|||
}
|
||||
}
|
||||
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue