Merge pull request #34 from jackhumbert/tmk-master

merging from tmk, new_project script and template

1 files changed, 0 insertions, 29 deletions

diff --git a/protocol/usb_hid/override_wiring.c b/protocol/usb_hid/override_wiring.c
deleted file mode 100644
index 1e9a94ce26..0000000000
--- a/protocol/usb_hid/override_wiring.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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();
-}