Adjust the burn and burn-net script to work with the new Deluge T2.

diff --git a/apps/tests/deluge/Blink/burn b/apps/tests/deluge/Blink/burn
index ce7b1b26aa5c4da3202a5bb36bf86b41762c9c94..ce357e7a2efbafb70f2fd8c13518da2c05fb02bf 100755 (executable)
--- a/apps/tests/deluge/Blink/burn
+++ b/apps/tests/deluge/Blink/burn
@@ -20,8 +20,8 @@ fi
 
 if [ $# -ne 2 ]; then
   echo "Usage: $0 <port> <platform>"
-  echo "<port>       For example, /dev/ttyUSB0"
-  echo "<platform>   \"micaz\", \"telosb\""
+  echo "  <port>       /dev/ttyUSB0"
+  echo "  <platform>   micaz or telosb"
   exit 2
 fi
 
@@ -63,7 +63,7 @@ echo  ============================= Compile a new Blink ========================
 CFLAGS=-DBLINK_REVERSE\ -DDELUGE_BASESTATION make ${PLATFORM}
 
 echo =============================== Upload the image ===============================
-${TOS_DELUGE} ${PORT} ${PLATFORM} -i 0 build/${PLATFORM}/tos_image.xml
+${TOS_DELUGE} ${PORT} ${PLATFORM} -i 1 build/${PLATFORM}/tos_image.xml
 
 echo '       +----------------------------------------------------------------+'
 echo '       |                                                                |'
@@ -80,4 +80,4 @@ echo '       +----------------------------------------------------------------+'
 read
 
 echo =========================== Reboot the base station ============================
-${TOS_DELUGE} ${PORT} ${PLATFORM} -b 0 
+${TOS_DELUGE} ${PORT} ${PLATFORM} -dr 1 

diff --git a/apps/tests/deluge/Blink/burn-net b/apps/tests/deluge/Blink/burn-net
index 26debcdc797bd3385c5e58e53782d0538cfd45c3..0d94b40c9634dbcd14a855343f9b2d6e1310cb5f 100755 (executable)
--- a/apps/tests/deluge/Blink/burn-net
+++ b/apps/tests/deluge/Blink/burn-net
@@ -7,8 +7,8 @@ fi
 
 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"
+  echo "  <platform>         micaz or telosb"
+  echo "  <number of motes>  how many motes will be used in the test"
   exit 2
 fi
 
@@ -80,30 +80,20 @@ echo '            +-----------------------------------------------------+'
 read
 
 echo ============================= Start dissemination ==============================
-${TOS_DELUGE} ${PORT} ${PLATFORM} -d 1
+${TOS_DELUGE} ${PORT} ${PLATFORM} -dr 1
 
 echo '         +------------------------------------------------------------+'
 echo '         |                                                            |'
 echo '         | The dissemination is completed when the second and third   |'
 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 '         |                 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 '        +-------------------------------------------------------------+'