keyboard/qmk-keychron-q3-colemak-dh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qmk/master' into merge-2023-06-03

Browse Source
This commit is contained in:
Ilya Zhuravlev
2023-06-03 12:35:25 -06:00
parent abe4b76351 f4a608255a
commit d6e95213e3
14389 changed files with 536595 additions and 476101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tmk_core/protocol/usb_hid/override_wiring.c
View File

@ -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)
{