[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/deluge/Blink burn-net, 1.2, 1.3 volumes-at45db.xml, 1.1, 1.2 volumes-stm25p.xml, 1.1, 1.2

[Razvan Musaloiu-E.]

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

Modified Files:
	burn-net volumes-at45db.xml volumes-stm25p.xml 
Log Message:
Fix the Deluge rollback gesture and increase the total number of Deluge images to 4. The first one is considered to be the Golden Image.


Index: burn-net
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/burn-net,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** burn-net	19 Jul 2007 02:19:38 -0000	1.2
--- burn-net	20 Dec 2007 02:31:39 -0000	1.3
***************
*** 66,70 ****
  
  echo ========= Upload the new image to the external flash of the last mote ==========
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -i 0 build/${PLATFORM}/tos_image.xml
  
  echo '            +-----------------------------------------------------+'
--- 66,70 ----
  
  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 '            +-----------------------------------------------------+'
***************
*** 81,85 ****
  
  echo ============================= Start dissemination ==============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -d 0
  
  echo '         +------------------------------------------------------------+'
--- 81,85 ----
  
  echo ============================= Start dissemination ==============================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -d 1
  
  echo '         +------------------------------------------------------------+'
***************
*** 97,101 ****
  
  echo ===================== Trigger the reboot in the new image ======================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -r 0
  
  echo '        +-------------------------------------------------------------+'
--- 97,101 ----
  
  echo ===================== Trigger the reboot in the new image ======================
! ${TOS_DELUGE} ${PORT} ${PLATFORM} -r 1
  
  echo '        +-------------------------------------------------------------+'

Index: volumes-at45db.xml
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/volumes-at45db.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** volumes-at45db.xml	2 Jun 2007 00:09:14 -0000	1.1
--- volumes-at45db.xml	20 Dec 2007 02:31:40 -0000	1.2
***************
*** 1,4 ****
  <volume_table>
!   <volume name="DELUGE0" size="65536"/>
    <volume name="DELUGE1" size="65536"/>
  </volume_table>
\ No newline at end of file
--- 1,6 ----
  <volume_table>
!   <volume name="GOLDENIMAGE" size="65536" base="0" />
    <volume name="DELUGE1" size="65536"/>
+   <volume name="DELUGE2" size="65536"/>
+   <volume name="DELUGE3" size="65536"/>
  </volume_table>
\ No newline at end of file

Index: volumes-stm25p.xml
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/deluge/Blink/volumes-stm25p.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** volumes-stm25p.xml	22 May 2007 20:34:20 -0000	1.1
--- volumes-stm25p.xml	20 Dec 2007 02:31:40 -0000	1.2
***************
*** 1,4 ****
  <volume_table>
!   <volume name="DELUGE0" size="65536"/>
    <volume name="DELUGE1" size="65536"/>
  </volume_table>
\ No newline at end of file
--- 1,6 ----
  <volume_table>
!   <volume name="GOLDENIMAGE" size="65536" base="983040" />
    <volume name="DELUGE1" size="65536"/>
+   <volume name="DELUGE2" size="65536"/>
+   <volume name="DELUGE3" size="65536"/>
  </volume_table>
\ No newline at end of file