summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--blink/Makefile2
-rw-r--r--blink/blink.c2
-rw-r--r--blink/led.c6
-rw-r--r--include.mk2
4 files changed, 7 insertions, 5 deletions
diff --git a/blink/Makefile b/blink/Makefile
index 75e423b..688e5a8 100644
--- a/blink/Makefile
+++ b/blink/Makefile
@@ -22,6 +22,6 @@
NAME := blink
OBJ := blink.o util.o led.o
-BOARD_TYPE := arduino2009
+BOARD_TYPE := hhd70dongle
include ../include.mk
diff --git a/blink/blink.c b/blink/blink.c
index 94c7bfb..ef1ebb0 100644
--- a/blink/blink.c
+++ b/blink/blink.c
@@ -32,7 +32,7 @@ int main(void)
led_init();
for(;;) {
- _delay_ms(250);
+ _delay_ms(200);
led_toggle();
}
}
diff --git a/blink/led.c b/blink/led.c
index ba4b681..c945564 100644
--- a/blink/led.c
+++ b/blink/led.c
@@ -23,14 +23,16 @@
#include "avr/io.h"
#include "led.h"
-#define HAS_LED 1
#if defined(__BOARD_arduinoUno__)
#define HAS_LED 0
+#else
+#define HAS_LED 1
#endif
-#define LED_DIR 1
#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__)
#define LED_DIR 0
+#else
+#define LED_DIR 1
#endif
#if defined(__BOARD_teensy1__) || defined(__BOARD_teensy1pp__) || defined(__BOARD_teensy2__) || defined(__BOARD_teensy2pp__)
diff --git a/include.mk b/include.mk
index 93c9a67..53b4953 100644
--- a/include.mk
+++ b/include.mk
@@ -208,7 +208,7 @@ run:
reset:
@if [ -n "$(RESET_FUNC)" ]; then \
if [ -x "$(RESET_FUNC)" ]; then \
- $(RESET_FUNC) $(RESET_PARAM); \
+ eval $(RESET_FUNC) $(RESET_PARAM); \
else \
echo "WARNING: ignoring non-existing or non-executable reset script"; \
fi \