aboutsummaryrefslogtreecommitdiffstats
path: root/src/glutt-o-logique/Makefile
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-26 15:01:25 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-09-26 15:01:25 +0200
commit80739758ca113e3f205b14e047ab77f12a559df0 (patch)
tree3ff7e6c6f06eb8d75849111de040418ee8f4aaa4 /src/glutt-o-logique/Makefile
parentb7f74a89a65933ec98d72fdaa5a02a6932ef9e39 (diff)
downloadglutte-o-matic-80739758ca113e3f205b14e047ab77f12a559df0.tar.gz
glutte-o-matic-80739758ca113e3f205b14e047ab77f12a559df0.tar.bz2
glutte-o-matic-80739758ca113e3f205b14e047ab77f12a559df0.zip
Suspend scheduler while waiting for ADC measurement
Diffstat (limited to 'src/glutt-o-logique/Makefile')
-rw-r--r--src/glutt-o-logique/Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/glutt-o-logique/Makefile b/src/glutt-o-logique/Makefile
index 8c7bf8b..ddfd4fd 100644
--- a/src/glutt-o-logique/Makefile
+++ b/src/glutt-o-logique/Makefile
@@ -161,3 +161,10 @@ else
/opt/openocd/bin/openocd -f /opt/openocd/share/openocd/scripts/board/stm32f4discovery.cfg -c "program bin/"$(BINELF)" verify reset" -c "init" -c "reset" -c "exit"
endif
+# Some STM32F4DISCOVERY have a newer ST-LINK II interface
+deploy21: $(BINDIR)/$(BINELF)
+ifeq ($(wildcard /opt/openocd/bin/openocd),)
+ /usr/bin/openocd -f stm32f4discovery-with-stlinkv2.1.cfg -c "program bin/"$(BINELF)" verify reset" -c "init" -c "reset" -c "exit"
+else
+ /opt/openocd/bin/openocd -f stm32f4discovery-with-stlinkv2.1.cfg -c "program bin/"$(BINELF)" verify reset" -c "init" -c "reset" -c "exit"
+endif