summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-05-29 06:17:24 +1000
committerNick Brassel <nick@tzarc.org>2023-05-29 06:17:24 +1000
commit5024370dd0b441e86ace3089193e84c5b050d892 (patch)
treeb661d5b154be987f9c3dba3a526b70e0b63f9fef /tmk_core
parent16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff)
parent8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff)
Merge branch 'develop'
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/protocol/usb_hid/override_wiring.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/protocol/usb_hid/override_wiring.c b/tmk_core/protocol/usb_hid/override_wiring.c
index adc6645f8e..40bb574d7d 100644
--- a/tmk_core/protocol/usb_hid/override_wiring.c
+++ b/tmk_core/protocol/usb_hid/override_wiring.c
@@ -2,7 +2,7 @@
* To keep Timer0 for common/timer.c override arduino/wiring.c.
*/
#define __DELAY_BACKWARD_COMPATIBLE__
-#include <util/delay.h>
+#include "wait.h"
#include "platforms/timer.h"
@@ -16,11 +16,11 @@ unsigned long micros(void)
}
void delay(unsigned long ms)
{
- _delay_ms(ms);
+ wait_ms(ms);
}
void delayMicroseconds(unsigned int us)
{
- _delay_us(us);
+ wait_us(us);
}
void init(void)
{