Merge pull request #34 from jackhumbert/tmk-master

merging from tmk, new_project script and template

1 files changed, 29 insertions, 0 deletions

diff --git a/tmk_core/protocol/usb_hid/override_wiring.c b/tmk_core/protocol/usb_hid/override_wiring.c
new file mode 100644
index 0000000000..1e9a94ce26
--- /dev/null
+++ b/tmk_core/protocol/usb_hid/override_wiring.c
@@ -0,0 +1,29 @@
+/*
+ * To keep Timer0 for common/timer.c override arduino/wiring.c.
+ */
+#define __DELAY_BACKWARD_COMPATIBLE__
+#include <util/delay.h>
+#include "common/timer.h"
+#include "Arduino.h"
+
+
+unsigned long millis()
+{
+    return timer_read32();
+}
+unsigned long micros()
+{
+    return timer_read32() * 1000UL;
+}
+void delay(unsigned long ms)
+{
+    _delay_ms(ms);
+}
+void delayMicroseconds(unsigned int us)
+{
+    _delay_us(us);
+}
+void init()
+{
+    timer_init();
+}