diff options
| author | XScorpion2 <rcalt2vt@gmail.com> | 2019-08-25 14:37:55 -0500 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-08-25 12:37:55 -0700 |
| commit | 957070a6b5886719557b6880afa7e3716548c18a (patch) | |
| tree | 68adde454ad00f5c74538b0927f76b7db7afcb09 /tmk_core/protocol | |
| parent | f22c5c17b6fe069bec1241262a1c27eb89d3d3af (diff) | |
| download | qmk_firmware-957070a6b5886719557b6880afa7e3716548c18a.tar.gz qmk_firmware-957070a6b5886719557b6880afa7e3716548c18a.zip | |
Added OLED Display autoscroll during periods of OLED data inactivity (#6546)
* Added OLED Display autoscroll during periods of OLED data inactivity.
* Fixing compile errors
* Feedback from review
Diffstat (limited to 'tmk_core/protocol')
| -rw-r--r-- | tmk_core/protocol/usb_hid/override_wiring.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tmk_core/protocol/usb_hid/override_wiring.c b/tmk_core/protocol/usb_hid/override_wiring.c index 1e9a94ce2..52f03c300 100644 --- a/tmk_core/protocol/usb_hid/override_wiring.c +++ b/tmk_core/protocol/usb_hid/override_wiring.c | |||
| @@ -4,14 +4,13 @@ | |||
| 4 | #define __DELAY_BACKWARD_COMPATIBLE__ | 4 | #define __DELAY_BACKWARD_COMPATIBLE__ |
| 5 | #include <util/delay.h> | 5 | #include <util/delay.h> |
| 6 | #include "common/timer.h" | 6 | #include "common/timer.h" |
| 7 | #include "Arduino.h" | ||
| 8 | 7 | ||
| 9 | 8 | ||
| 10 | unsigned long millis() | 9 | unsigned long millis(void) |
| 11 | { | 10 | { |
| 12 | return timer_read32(); | 11 | return timer_read32(); |
| 13 | } | 12 | } |
| 14 | unsigned long micros() | 13 | unsigned long micros(void) |
| 15 | { | 14 | { |
| 16 | return timer_read32() * 1000UL; | 15 | return timer_read32() * 1000UL; |
| 17 | } | 16 | } |
| @@ -23,7 +22,7 @@ void delayMicroseconds(unsigned int us) | |||
| 23 | { | 22 | { |
| 24 | _delay_us(us); | 23 | _delay_us(us); |
| 25 | } | 24 | } |
| 26 | void init() | 25 | void init(void) |
| 27 | { | 26 | { |
| 28 | timer_init(); | 27 | timer_init(); |
| 29 | } | 28 | } |
