[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/deluge/Blink Makefile, 1.2, 1.3 burn, 1.7, 1.8 burn-net, 1.4, 1.5
Razvan Musaloiu-E.
razvanm at users.sourceforge.net
Mon May 19 14:25:10 PDT 2008
Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21259/apps/tests/deluge/Blink
Modified Files:
Makefile burn burn-net
Log Message:
Merge of the latest Deluge T2.
Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 25 May 2007 18:01:18 -0000 1.2
--- Makefile 19 May 2008 21:25:08 -0000 1.3
***************
*** 2,6 ****
TINYOS_NP=BNP
! CFLAGS += -DDELUGE_BASESTATION
include $(MAKERULES)
--- 2,7 ----
TINYOS_NP=BNP
! #CFLAGS += -DDELUGE_BASESTATION
! #CFLAGS += -DDELUGE_LIGHT_BASESTATION
include $(MAKERULES)
Index: burn
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/burn,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** burn 24 Jan 2008 00:14:01 -0000 1.7
--- burn 19 May 2008 21:25:08 -0000 1.8
***************
*** 19,33 ****
fi
! if [ $# -ne 2 ]; then
! echo "Usage: $0 <port> <platform>"
echo " <port> /dev/ttyUSB0"
! echo " <platform> micaz or telosb"
exit 2
fi
! PORT=$1
PLATFORM=$2
! if [ ${PLATFORM} != 'micaz' -a ${PLATFORM} != 'telosb' ]; then
echo "\"${PLATFORM}\" is not a supported platform"
exit 2
--- 19,40 ----
fi
! if [[ $# -ne 2 && $# -ne 3 ]]; then
! echo "Usage: $0 <port> [<comm_port>] <platform>"
echo " <port> /dev/ttyUSB0"
! echo " <comm_port> /dev/ttyUSB1"
! echo " <platform> micaz, telosb or iris"
exit 2
fi
! PPORT=$1
! CPORT=$1
PLATFORM=$2
! if [ $# -eq 3 ]; then
! CPORT=$2
! PLATFORM=$3
! fi
!
! if [ ${PLATFORM} != 'micaz' -a ${PLATFORM} != 'telosb' -a ${PLATFORM} != 'iris' ]; then
echo "\"${PLATFORM}\" is not a supported platform"
exit 2
***************
*** 45,54 ****
if [ $PLATFORM == 'micaz' ]
then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install mib510,${PORT}
elif [ $PLATFORM == 'telosb' ]
then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install bsl,${PORT}
fi
echo ' +-------------------------------------------------------+'
echo ' | |'
--- 52,65 ----
if [ $PLATFORM == 'micaz' ]
then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install mib510,${PPORT}
elif [ $PLATFORM == 'telosb' ]
then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install bsl,${PPORT}
! elif [ $PLATFORM == 'iris' ]
! then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install mib510,${PPORT}
fi
+
echo ' +-------------------------------------------------------+'
echo ' | |'
***************
*** 64,68 ****
echo =============================== Upload the image ===============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -i 1 build/${PLATFORM}/tos_image.xml
echo ' +----------------------------------------------------------------+'
--- 75,79 ----
echo =============================== Upload the image ===============================
! ${TOS_DELUGE} ${CPORT} ${PLATFORM} -i 1 build/${PLATFORM}/tos_image.xml
echo ' +----------------------------------------------------------------+'
***************
*** 81,83 ****
echo =========================== Reboot the base station ============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -r 1
--- 92,94 ----
echo =========================== Reboot the base station ============================
! ${TOS_DELUGE} ${CPORT} ${PLATFORM} -r 1
Index: burn-net
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/burn-net,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** burn-net 14 Jan 2008 18:12:46 -0000 1.4
--- burn-net 19 May 2008 21:25:08 -0000 1.5
***************
*** 8,12 ****
if [ $# -ne 2 ]; then
echo "Usage: $0 <platform> <number of motes>"
! echo " <platform> micaz or telosb"
echo " <number of motes> how many motes will be used in the test"
exit 2
--- 8,12 ----
if [ $# -ne 2 ]; then
echo "Usage: $0 <platform> <number of motes>"
! echo " <platform> micaz, telosb or iris"
echo " <number of motes> how many motes will be used in the test"
exit 2
***************
*** 16,20 ****
NO_MOTES=$2
! if [ ${PLATFORM} != 'micaz' -a ${PLATFORM} != 'telosb' ]; then
echo "\"${PLAFTORM}\" is not a supported platform"
exit 2
--- 16,20 ----
NO_MOTES=$2
! if [ ${PLATFORM} != 'micaz' -a ${PLATFORM} != 'telosb' -a ${PLATFORM} != 'iris' ]; then
echo "\"${PLAFTORM}\" is not a supported platform"
exit 2
***************
*** 29,55 ****
echo ================================ Compile Blink =================================
make clean
- CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM}
ID=0
function burn_one() {
ID=`expr $ID + 1`
! echo -n ">>> Please plug mote $ID and type the port to continue: "
read PORT
if [ ${PLATFORM} == 'micaz' ]
then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} reinstall,$ID mib510,${PORT}
elif [ ${PLATFORM} == 'telosb' ]
then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} reinstall,$ID bsl,${PORT}
fi
-
}
! while [[ ${NO_MOTES} > 0 ]]
do
! burn_one
NO_MOTES=`expr ${NO_MOTES} - 1`
done
echo ' +------------------------------------------------------------------------+'
--- 29,61 ----
echo ================================ Compile Blink =================================
make clean
ID=0
function burn_one() {
ID=`expr $ID + 1`
! echo -n ">>> Please plug mote $ID and type the programming port to continue: "
read PORT
if [ ${PLATFORM} == 'micaz' ]
then
! CFLAGS=$1 make ${PLATFORM} install,$ID mib510,${PORT}
elif [ ${PLATFORM} == 'telosb' ]
then
! CFLAGS=$1 make ${PLATFORM} install,$ID bsl,${PORT}
! elif [ ${PLATFORM} == 'iris' ]
! then
! CFLAGS=$1 make ${PLATFORM} install,$ID mib510,${PORT}
fi
}
! while [[ ${NO_MOTES} > 1 ]]
do
! burn_one -DDELUGE_LIGHT_BASESTATION
NO_MOTES=`expr ${NO_MOTES} - 1`
done
+ echo ">>> Note: this last mote will be the basestation! <<<"
+ burn_one -DDELUGE_BASESTATION
+ echo -n ">>> Please plug mote $ID and type the communication port to continue: "
+ read PORT
+ BASESTATION_PORT=$PORT
echo ' +------------------------------------------------------------------------+'
***************
*** 63,70 ****
echo ============================= Compile a new Blink ==============================
! CFLAGS=-DBLINK_REVERSE\ -DDELUGE_BASESTATION make ${PLATFORM}
echo ========= Upload the new image to the external flash of the last mote ==========
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -i 1 build/${PLATFORM}/tos_image.xml
echo ' +-----------------------------------------------------+'
--- 69,76 ----
echo ============================= Compile a new Blink ==============================
! CFLAGS=-DBLINK_REVERSE\ -DDELUGE_LIGHT_BASESTATION make ${PLATFORM}
echo ========= Upload the new image to the external flash of the last mote ==========
! ${TOS_DELUGE} ${BASESTATION_PORT} ${PLATFORM} -i 1 build/${PLATFORM}/tos_image.xml
echo ' +-----------------------------------------------------+'
***************
*** 77,85 ****
echo ' | |'
echo ' +-----------------------------------------------------+'
-
read
echo ============================= Start dissemination ==============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -dr 1
echo ' +------------------------------------------------------------+'
--- 83,90 ----
echo ' | |'
echo ' +-----------------------------------------------------+'
read
echo ============================= Start dissemination ==============================
! ${TOS_DELUGE} ${BASESTATION_PORT} ${PLATFORM} -dr 1
echo ' +------------------------------------------------------------+'
More information about the Tinyos-2-commits
mailing list