Makefile updates: update MONITOR_PORT, add AVRDUDE_CONF

[toast/airingbutler.git] / Makefile

diff --git a/Makefile b/Makefile
index 54469cea804c901426eb993698b78604b777890c..fcbece5c3e60b4960ae4d94f70dbd048bc51997c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,13 @@ BOARD_TAG=uno
 
 HOSTNAME=$(shell hostname)
 ifeq ($(HOSTNAME),jadzia)
-MONITOR_PORT=/dev/ttyACM1
+MONITOR_PORT=/dev/arduino
 else
 MONITOR_PORT=/dev/ttyACM0
 endif
 
+AVRDUDE_CONF=/etc/avrdude.conf
+
 # ARDUINO_SKETCHBOOK=~/sketchbook
 include /usr/share/arduino/Arduino.mk
 
@@ -18,7 +20,7 @@ all: $(CURDIR)
 log.csv: log
        cp $< $@
        fromdos $@
-       sed -i -e '/Started/ d' -e '/Finished/ d ' -e '/-[0-9]/ d' -e 's/ O: /,/g' $@
+       sed -i -e '/Started/ d' -e '/Finished/ d' -e '/error: / d' -e '/-[0-9]/ d' -e 's/ O: /,/g' $@
        perl -ni -e 'BEGIN{$$i=0}; print if ($$_ !~ /CO2/ || $$i == 0); $$i++;' $@
 
 STARTDATE=$(shell date "+%F" --date @$$(stat --format "%Y" $$(find -name "log-*.gz" | sort | tail -n 1)))