ezri/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fl16-july-merge

Browse Source
This commit is contained in:
Daniel Schaefer
2023-07-14 15:52:17 +08:00
parent b49c27a492 fa0b4511dd
commit cc3f63e8e3
15243 changed files with 590081 additions and 480796 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)
{