X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=659bf66281f16a38784529da8d9d3af79da022c0;hb=9c5924131d4447eb12f38bfa93bf323be5e7214b;hp=9b3913fdd2ce718207f5bac3c28e437b60d4a39f;hpb=b30ffc598319704184055df4e282cba6e7585db8;p=slipway.git

diff --git a/Makefile b/Makefile
index 9b3913f..659bf66 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ endif
 ## slipway ############################################################################
 
 run: slipway.jar 
-	java -cp slipway.jar edu.berkeley.obits.AtmelSerial < bitstreams/led0.md4
+	java -cp slipway.jar edu.berkeley.slipway.Demo
 
 build/src/com/ftdi/usb/FtdiUart.c: src/com/ftdi/usb/FtdiUart.i
 	mkdir -p `dirname $@`
@@ -52,7 +52,7 @@ upstream/libusb/.built: upstream/libusb
 
 ## for rebuilding usbdrone.hex ###########################################################
 
-build/slipway_drone.hex: src/edu/berkeley/slipway/slipway_drone.c  upstream/avr-libc/.built
+build/slipway_drone.hex: src/edu/berkeley/slipway/FtdiBoardSlave.c  upstream/avr-libc/.built
 	upstream/prefix/bin/avr-gcc -O3 -mmcu=at94k $< -o $@.o
 	upstream/prefix/bin/avr-objcopy -O ihex $@.o $@
 
@@ -65,6 +65,7 @@ bitstreams/slipway_drone.bst: build/slipway_drone.hex
 	rm /afs/research.cs.berkeley.edu/user/megacz/edu.berkeley.obits/usbdrone.hex
 	diff -u /afs/research.cs.berkeley.edu/user/megacz/stupid/fpslic_stupid.bst $@ && exit -1; true
 	mv /afs/research.cs.berkeley.edu/user/megacz/stupid/fpslic_stupid.bst $@
+	touch $@