[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/deluge/Blink burn, 1.9, 1.10 burn-net, 1.5, 1.6
Razvan Musaloiu-E.
razvanm at users.sourceforge.net
Sun Dec 14 16:50:39 PST 2008
Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23246/apps/tests/deluge/Blink
Modified Files:
burn burn-net
Log Message:
Improvements to tos.py.
This latest version includes:
* support for MIB600
* a generic dump program (tos-dump) that has support for decoding the
printf packets
* a few example programs for some of the applications (Oscilloscope,
MultihopOscilloscope, TestFtsp, TestLocalTime).
Index: burn
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/burn,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** burn 25 Aug 2008 16:48:45 -0000 1.9
--- burn 15 Dec 2008 00:50:37 -0000 1.10
***************
*** 1,40 ****
#!/bin/bash
! python -c '
! import sys
! try:
! import serial
! except ImportError, e:
! sys.exit(1)'
if [[ $? != 0 ]]
then
! echo "Please install PySerial first."
exit 2
fi
- TOS_DELUGE=`type -p tos-deluge`
- if [[ ! -x ${TOS_DELUGE} ]] ; then
- TOS_DELUGE=../../../../tools/tinyos/misc/tos-deluge
- 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, iris or epic"
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' -a ${PLATFORM} != 'epic' ]; then
echo "\"${PLATFORM}\" is not a supported platform"
exit 2
--- 1,34 ----
#!/bin/bash
! TOS_DELUGE=`type -p tos-deluge`
! if [[ ! -x ${TOS_DELUGE} ]] ; then
! TOS_DELUGE=../../../../tools/tinyos/misc/tos-deluge
! fi
!
! $TOS_DELUGE > /dev/null
if [[ $? != 0 ]]
then
! echo "Unable to locate tos-deluge."
exit 2
fi
if [[ $# -ne 2 && $# -ne 3 ]]; then
! echo "Usage: $0 <prog_source> <comm_source> <platform>"
! echo " <prog_source> bsl,PORT | mib510,PORT | eprb,PORT"
! echo " <comm_source> serial at PORT:SPEED | network at HOST:PORT"
! echo " <platform> micaz | telosb | iris | epic"
exit 2
fi
PPORT=$1
! CPORT=$2
! PLATFORM=$3
! if [ ${PLATFORM} != 'micaz' -a \
! ${PLATFORM} != 'telosb' -a \
! ${PLATFORM} != 'iris' -a \
! ${PLATFORM} != 'epic' ]
! then
echo "\"${PLATFORM}\" is not a supported platform"
exit 2
***************
*** 50,63 ****
echo ============================ Compile and load Blink ============================
! if [ $PLATFORM == 'micaz' ]
! then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install mib510,${PPORT}
! elif [ $PLATFORM == 'telosb' -o $PLATFORM == 'epic' ]
! then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install bsl,${PPORT}
! elif [ $PLATFORM == 'iris' ]
! then
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install mib510,${PPORT}
! fi
--- 44,48 ----
echo ============================ Compile and load Blink ============================
! CFLAGS=-DDELUGE_BASESTATION make ${PLATFORM} install ${PPORT}
***************
*** 75,79 ****
echo =============================== Upload the image ===============================
! ${TOS_DELUGE} ${CPORT} ${PLATFORM} -i 1 build/${PLATFORM}/tos_image.xml
echo ' +----------------------------------------------------------------+'
--- 60,64 ----
echo =============================== Upload the image ===============================
! ${TOS_DELUGE} ${CPORT} -i 1 build/${PLATFORM}/tos_image.xml
echo ' +----------------------------------------------------------------+'
***************
*** 92,94 ****
echo =========================== Reboot the base station ============================
! ${TOS_DELUGE} ${CPORT} ${PLATFORM} -r 1
--- 77,79 ----
echo =========================== Reboot the base station ============================
! ${TOS_DELUGE} ${CPORT} -r 1
Index: burn-net
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/burn-net,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** burn-net 19 May 2008 21:25:08 -0000 1.5
--- burn-net 15 Dec 2008 00:50:37 -0000 1.6
***************
*** 6,9 ****
--- 6,17 ----
fi
+ $TOS_DELUGE > /dev/null
+
+ if [[ $? != 0 ]]
+ then
+ echo "Unable to locate tos-deluge."
+ exit 2
+ fi
+
if [ $# -ne 2 ]; then
echo "Usage: $0 <platform> <number of motes>"
***************
*** 16,20 ****
NO_MOTES=$2
! if [ ${PLATFORM} != 'micaz' -a ${PLATFORM} != 'telosb' -a ${PLATFORM} != 'iris' ]; then
echo "\"${PLAFTORM}\" is not a supported platform"
exit 2
--- 24,32 ----
NO_MOTES=$2
! if [ ${PLATFORM} != 'micaz' -a \
! ${PLATFORM} != 'telosb' -a \
! ${PLATFORM} != 'iris' \
! ${PLATFORM} != 'epic' ]
! then
echo "\"${PLAFTORM}\" is not a supported platform"
exit 2
***************
*** 33,49 ****
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
}
--- 45,52 ----
function burn_one() {
ID=`expr $ID + 1`
! echo -n ">>> Please plug mote $ID and type the programming sorce (bsl,PORT | mib510,PORT | eprb,PORT): "
read PORT
! CFLAGS=$1 make ${PLATFORM} install,$ID ${PORT}
}
***************
*** 55,61 ****
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 ' +------------------------------------------------------------------------+'
--- 58,63 ----
echo ">>> Note: this last mote will be the basestation! <<<"
burn_one -DDELUGE_BASESTATION
! echo -n ">>> Please plug mote $ID and type the communication sorce (serial at PORT:SPEED | network at HOST:PORT) to continue: "
! read CPORT
echo ' +------------------------------------------------------------------------+'
***************
*** 72,76 ****
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 ' +-----------------------------------------------------+'
--- 74,78 ----
echo ========= Upload the new image to the external flash of the last mote ==========
! ${TOS_DELUGE} ${CPORT} -i 1 build/${PLATFORM}/tos_image.xml
echo ' +-----------------------------------------------------+'
***************
*** 86,90 ****
echo ============================= Start dissemination ==============================
! ${TOS_DELUGE} ${BASESTATION_PORT} ${PLATFORM} -dr 1
echo ' +------------------------------------------------------------+'
--- 88,92 ----
echo ============================= Start dissemination ==============================
! ${TOS_DELUGE} ${CPORT} -dr 1
echo ' +------------------------------------------------------------+'
More information about the Tinyos-2-commits
mailing list