X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=firmware%2FMakefile;h=b3e15ddac80843f820ffc06cd1379168fc2384a2;hp=5f9b2995c351b72360afb569d7b411f0876bc1b9;hb=4ee2501ff864b8e15202ee814e8bafcc0c2adf6c;hpb=612479558c6a9be836c331c46e04b8f0b28fbabc

diff --git a/firmware/Makefile b/firmware/Makefile
index 5f9b299..b3e15dd 100755
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -1,16 +1,21 @@
 ## see README file
 
 TARGET = tuer
-INSTALL_DIR = /home/realraum/tuer_svn/firmware/arduino
-PORT = /dev/ttyUSB0
-UPLOAD_RATE = 19200
+INSTALL_DIR = $(PWD)/arduino
+PORT = /dev/door
+#UPLOAD_RATE = 19200
+UPLOAD_RATE = 57600
 AVRDUDE_PROGRAMMER = stk500v1
-MCU = atmega168
-F_CPU = 16000000
+#MCU = atmega168
+MCU = atmega328p
+#F_CPU = 16000000
+F_CPU = 16000000L
 
 ############################################################################
 # Below here nothing should be changed...
 
+RESET_TTY_DIR=../reset_tty/
+RESET_TTY=$(RESET_TTY_DIR)reset_tty
 ARDUINO = $(INSTALL_DIR)/hardware/cores/arduino
 AVR_TOOLS_PATH = /usr/bin
 SRC =  $(ARDUINO)/pins_arduino.c $(ARDUINO)/wiring.c \
@@ -113,9 +118,12 @@ lss: applet/$(TARGET).lss
 sym: applet/$(TARGET).sym
 
 # Program the device.  
-upload: applet/$(TARGET).hex
+upload: applet/$(TARGET).hex $(RESET_TTY)
+	$(RESET_TTY) $(PORT) 
 	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH)
 
+$(RESET_TTY):
+	make -C $(RESET_TTY_DIR)
 
 	# Display size of file.
 HEXSIZE = $(SIZE) --target=$(FORMAT) applet/$(TARGET).hex