[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/deluge/Blink burn, 1.5, 1.6 burn-net, 1.3, 1.4

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3508

Modified Files:
	burn burn-net 
Log Message:
Adjust the burn and burn-net script to work with the new Deluge T2.


Index: burn
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/burn,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** burn	19 Jul 2007 02:19:38 -0000	1.5
--- burn	14 Jan 2008 18:12:46 -0000	1.6
***************
*** 21,26 ****
  if [ $# -ne 2 ]; then
    echo "Usage: $0 <port> <platform>"
!   echo "<port>       For example, /dev/ttyUSB0"
!   echo "<platform>   \"micaz\", \"telosb\""
    exit 2
  fi
--- 21,26 ----
  if [ $# -ne 2 ]; then
    echo "Usage: $0 <port> <platform>"
!   echo "  <port>       /dev/ttyUSB0"
!   echo "  <platform>   micaz or telosb"
    exit 2
  fi
***************
*** 64,68 ****
  
  echo =============================== Upload the image ===============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -i 0 build/${PLATFORM}/tos_image.xml
  
  echo '       +----------------------------------------------------------------+'
--- 64,68 ----
  
  echo =============================== Upload the image ===============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -i 1 build/${PLATFORM}/tos_image.xml
  
  echo '       +----------------------------------------------------------------+'
***************
*** 81,83 ****
  
  echo =========================== Reboot the base station ============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -b 0 
--- 81,83 ----
  
  echo =========================== Reboot the base station ============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -dr 1 

Index: burn-net
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/burn-net,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** burn-net	20 Dec 2007 02:31:39 -0000	1.3
--- burn-net	14 Jan 2008 18:12:46 -0000	1.4
***************
*** 8,13 ****
  if [ $# -ne 2 ]; then
    echo "Usage: $0 <platform> <number of motes>"
!   echo "<platform>         \"micaz\", \"telosb\""
!   echo "<number of motes>  how many motes will be used in the test"
    exit 2
  fi
--- 8,13 ----
  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
  fi
***************
*** 81,85 ****
  
  echo ============================= Start dissemination ==============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -d 1
  
  echo '         +------------------------------------------------------------+'
--- 81,85 ----
  
  echo ============================= Start dissemination ==============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -dr 1
  
  echo '         +------------------------------------------------------------+'
***************
*** 88,109 ****
  echo '         | led from all the motes except the last one stops blinking. |'
  echo '         |                                                            |'
  echo '         | In the next step the motes will be rebooted to allow the   |'
  echo '         | reprogramming to take place.                               |'
  echo '         |                                                            |'
- echo '         |                 Press ENTER to continue...                 |'
- echo '         |                                                            |'
  echo '         +------------------------------------------------------------+'
- read
- 
- echo ===================== Trigger the reboot in the new image ======================
- ${TOS_DELUGE} ${PORT} ${PLATFORM} -r 1
  
- echo '        +-------------------------------------------------------------+'
- echo '        |                                                             |'
- echo '        | All the motes except the last one should reboot, reprogram  |'
- echo '        | the internal flash with the new image and start running it. |'
- echo '        | The end result should be that the last led (blue/yellow)    |'
- echo '        | from all the motes except the last one is blinking.         |'
- echo '        |                                                             |'
- echo '        +-------------------------------------------------------------+'
  
--- 88,99 ----
  echo '         | led from all the motes except the last one stops blinking. |'
  echo '         |                                                            |'
+ echo '         | After a mote gets the whole image he will reboot and       |'
+ echo '         | reprogram itself. If the new image contains Deluge he will |'
+ echo '         | continue participating in dissemination.                   |'
+ echo '         |                                                            |'
  echo '         | In the next step the motes will be rebooted to allow the   |'
  echo '         | reprogramming to take place.                               |'
  echo '         |                                                            |'
  echo '         +------------------------------------------------------------+'