From 858fd58bb4c9bf08a20000684d1fd668a623565c Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 4 Nov 2017 19:43:54 +0100
Subject: call reset function @ run

---
 defines.mk |  2 ++
 include.mk | 23 +++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/defines.mk b/defines.mk
index 36be378..3ac16ac 100644
--- a/defines.mk
+++ b/defines.mk
@@ -223,6 +223,8 @@ ifeq ($(BOARD_TYPE),robotdynMega2560)
   UPLOAD_RATE := 115200
   PROG_TYPE := wiring
   AVRDUDE_PORT := /dev/ttyUSB0
+  RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_arduino
+  RESET_PARAM = $(AVRDUDE_PORT)
 endif
 ifeq ($(BOARD_TYPE),AvrNetIo)
   MCU := atmega32
diff --git a/include.mk b/include.mk
index 53795cb..66daa10 100644
--- a/include.mk
+++ b/include.mk
@@ -271,9 +271,10 @@ define avrdude/flash
 endef
 
 define avrdude/run
+	$(call generic/reset,)
 endef
 
-### avrdudeManualErase
+### avrdudeNoErase
 define avrdudeNoErase/erase
 endef
 
@@ -282,6 +283,7 @@ define avrdudeNoErase/flash
 endef
 
 define avrdudeNoErase/run
+	$(call generic/reset,)
 endef
 
 ### micronucleus
@@ -295,6 +297,17 @@ endef
 define micronucleus/run
 endef
 
+### Generic
+define generic/reset
+	@if [ -n "$(RESET_FUNC)" ]; then    \
+    if [ -x "$(RESET_FUNC)" ]; then   \
+      eval $(RESET_FUNC) $(RESET_PARAM);   \
+    else                              \
+      echo "WARNING: ignoring non-existing or non-executable reset script"; \
+    fi                                \
+  fi
+endef
+
 ### Program Targets
 program: reset erase flash run
 
@@ -308,10 +321,4 @@ run:
 	$(call $(PROG)/$@,)
 
 reset:
-	@if [ -n "$(RESET_FUNC)" ]; then    \
-    if [ -x "$(RESET_FUNC)" ]; then   \
-      eval $(RESET_FUNC) $(RESET_PARAM);   \
-    else                              \
-      echo "WARNING: ignoring non-existing or non-executable reset script"; \
-    fi                                \
-  fi
+	$(call generic/reset,)
-- 
cgit v1.2.3