diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-05 13:28:01 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-05 13:28:01 +0000 |
| commit | b4e02f8ddfdd945ea33e2dac722c4ad21a147f5f (patch) | |
| tree | bed080fcf3bf41731476795a113ef8c8dd5f8f80 /quantum | |
| parent | 1816b163153b17b1ade22a905bf9509cc2f1b774 (diff) | |
| parent | b2d0e8a491f347d43b482808a744642fc975afab (diff) | |
| download | qmk_firmware-b4e02f8ddfdd945ea33e2dac722c4ad21a147f5f.tar.gz qmk_firmware-b4e02f8ddfdd945ea33e2dac722c4ad21a147f5f.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/pointing_device.c | 11 | ||||
| -rw-r--r-- | quantum/quantum.c | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c index fbcc08e6d..09d889f69 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/>. | |||
| 25 | 25 | ||
| 26 | static report_mouse_t mouseReport = {}; | 26 | static report_mouse_t mouseReport = {}; |
| 27 | 27 | ||
| 28 | __attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) { | 28 | __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); } |
| 29 | return (new.buttons != old.buttons) || | ||
| 30 | (new.x && new.x != old.x) || | ||
| 31 | (new.y && new.y != old.y) || | ||
| 32 | (new.h && new.h != old.h) || | ||
| 33 | (new.v && new.v != old.v); | ||
| 34 | } | ||
| 35 | |||
| 36 | 29 | ||
| 37 | __attribute__((weak)) void pointing_device_init(void) { | 30 | __attribute__((weak)) void pointing_device_init(void) { |
| 38 | // initialize device, if that needs to be done. | 31 | // initialize device, if that needs to be done. |
| @@ -50,7 +43,7 @@ __attribute__((weak)) void pointing_device_send(void) { | |||
| 50 | mouseReport.y = 0; | 43 | mouseReport.y = 0; |
| 51 | mouseReport.v = 0; | 44 | mouseReport.v = 0; |
| 52 | mouseReport.h = 0; | 45 | mouseReport.h = 0; |
| 53 | old_report = mouseReport; | 46 | old_report = mouseReport; |
| 54 | } | 47 | } |
| 55 | 48 | ||
| 56 | __attribute__((weak)) void pointing_device_task(void) { | 49 | __attribute__((weak)) void pointing_device_task(void) { |
diff --git a/quantum/quantum.c b/quantum/quantum.c index 5e0cde8a2..8ae487bec 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -744,9 +744,7 @@ void send_byte(uint8_t number) { | |||
| 744 | send_nibble(number & 0xF); | 744 | send_nibble(number & 0xF); |
| 745 | } | 745 | } |
| 746 | 746 | ||
| 747 | void send_nibble(uint8_t number) { | 747 | void send_nibble(uint8_t number) { tap_code16(hex_to_keycode(number)); } |
| 748 | tap_code16(hex_to_keycode(number)); | ||
| 749 | } | ||
| 750 | 748 | ||
| 751 | __attribute__((weak)) uint16_t hex_to_keycode(uint8_t hex) { | 749 | __attribute__((weak)) uint16_t hex_to_keycode(uint8_t hex) { |
| 752 | hex = hex & 0xF; | 750 | hex = hex & 0xF; |
