changed the Makefile rules for uploading to sky-nodes.

the earlier approach caused problems sometimes, resulting in command succeeding without all nodes being reprogrammed
This commit is contained in:
fros4943 2009-03-26 13:29:44 +00:00
parent a034df48cf
commit ac22ad5081

View File

@ -1,4 +1,4 @@
# $Id: Makefile.sky,v 1.21 2009/02/04 17:51:49 fros4943 Exp $
# $Id: Makefile.sky,v 1.22 2009/03/26 13:29:44 fros4943 Exp $
ARCH=msp430.c leds.c watchdog.c light.c spi.c ds2411.c \
@ -74,25 +74,25 @@ sky-motes:
sky-upload: sky-reset
$(MAKE) -j $(NUMPAR) sky-upload-sequence
sky-upload-sequence: $(foreach PORT, $(MOTES), $(PORT).sky-u)
sky-upload-sequence: $(foreach PORT, $(MOTES), sky-u.$(PORT))
@echo Done
sky-reset:
$(MAKE) -k -j $(NUMPAR) sky-reset-sequence
sky-reset-sequence: $(foreach PORT, $(MOTES), $(PORT).sky-r)
sky-reset-sequence: $(foreach PORT, $(MOTES), sky-r.$(PORT))
@echo Done
%.sky-u:
@echo +++++ Erasing $(basename $@) ; \
$(BSL) -c $(basename $@) -e && sleep 2 ; \
echo +++++ Programming $(basename $@) ; \
$(BSL) -c $(basename $@) $(BSL_FILETYPE) -p $(IHEXFILE) && sleep 2 ; \
echo +++++ Resetting $(basename $@) ; \
$(BSL) -c $(basename $@) -r
sky-u.%:
@echo +++++ Erasing $* ; \
$(BSL) -c $* -e && sleep 2 ; \
echo +++++ Programming $* ; \
$(BSL) -c $* $(BSL_FILETYPE) -p $(IHEXFILE) && sleep 2 ; \
echo +++++ Resetting $* ; \
$(BSL) -c $* -r
%.sky-r:
$(BSL) -c $(basename $@) -r
sky-r.%:
$(BSL) -c $* -r
sizeplot:
msp430-size $(OBJECTDIR)/*.o | $(CONTIKI)/tools/sky/check-size > size-data