X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=hw2%2Fmakefile;h=d6dd6ec30339e3df3774e3eaaf44dabd72ca56d6;hb=83b574a16cf66deda0fa95b6bc43a4b293162593;hp=8e8b2ee95b2bd38d2a8858dfd50ccd6938e881ab;hpb=7809f2b477c2eec8d27e45b3e441002509cfc556;p=~andy%2Fcsm213a-hw

diff --git a/hw2/makefile b/hw2/makefile
index 8e8b2ee..d6dd6ec 100644
--- a/hw2/makefile
+++ b/hw2/makefile
@@ -1,3 +1,5 @@
+-include config.mk
+
 # Common settings
 UART0    = /dev/ttyACM0
 UART1    = /dev/ttyACM1
@@ -7,8 +9,6 @@ CPPFLAGS =
 LDFLAGS  = -lm
 
 # Common rules
-default: all
-
 all: mbed.elf tester.elf control
 
 terms:
@@ -25,7 +25,8 @@ mbed.elf: main.o main_time.o main_emit.o main_comm.o \
 mbed-run: mbed.bin control install.sh
 	@./install.sh $<
 	@./control $(UART0) 1
-	@./control $(UART1) 2 sync
+	@./control $(UART0) 2
+	@./control $(UART0) 1 sync
 
 # Testing mbed (mbed3)
 tester.elf: tester.o serial_irq.o timer_dma.o messages.o