[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools Deluge.java, 1.4, 1.5 Pinger.java, 1.1, 1.2

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5247

Modified Files:
	Deluge.java Pinger.java 
Log Message:
- Grabs the number of Deluge images the node supports directly from
the node rather than grabbing the constant from ncg.



Index: Deluge.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Deluge.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Deluge.java	17 Jan 2005 19:48:14 -0000	1.4
--- Deluge.java	18 Jan 2005 20:49:16 -0000	1.5
***************
*** 191,195 ****
      case S_INJECT:
  
!       if (imageNum < 1 || imageNum >= DelugeConsts.DELUGE_NUM_IMAGES) {
  	System.out.println("ERROR: Invalid image number.");
  	System.exit(0);
--- 191,195 ----
      case S_INJECT:
  
!       if (imageNum < 1 || imageNum >= pinger.getNumImages()) {
  	System.out.println("ERROR: Invalid image number.");
  	System.exit(0);
***************
*** 211,215 ****
      case S_ERASE:
  
!       if (imageNum < 1 || imageNum >= DelugeConsts.DELUGE_NUM_IMAGES) {
  	System.out.println("ERROR: Invalid image number.");
  	System.exit(0);
--- 211,215 ----
      case S_ERASE:
  
!       if (imageNum < 1 || imageNum >= pinger.getNumImages()) {
  	System.out.println("ERROR: Invalid image number.");
  	System.exit(0);
***************
*** 227,231 ****
      case S_REBOOT:
  
!       if (imageNum < 0 || imageNum >= DelugeConsts.DELUGE_NUM_IMAGES) {
  	System.out.println("ERROR: Invalid image number.");
  	System.exit(0);
--- 227,231 ----
      case S_REBOOT:
  
!       if (imageNum < 0 || imageNum >= pinger.getNumImages()) {
  	System.out.println("ERROR: Invalid image number.");
  	System.exit(0);

Index: Pinger.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Pinger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Pinger.java	17 Jan 2005 19:48:18 -0000	1.1
--- Pinger.java	18 Jan 2005 20:49:28 -0000	1.2
***************
*** 59,62 ****
--- 59,65 ----
  
    private boolean resolvedNodeType = false;
+   private int numImages = -1;
+ 
+   private boolean pingComplete = false;
  
    public Pinger(MoteIF moteif, boolean verbose) {
***************
*** 80,93 ****
      setupNewImage();
  
!     for(;;) {
        try {
  	Thread.currentThread().sleep(1000);
  
! 	if (advMsg.get_imgDesc_imgNum() >= DelugeConsts.DELUGE_NUM_IMAGES)
  	  break;
! 	
  	advMsg = DelugeCrc.computeAdvCrc(advMsg);
  	send(advMsg);
  	if (verbose) System.out.print(advMsg);
        } catch (Exception e) {
  	e.printStackTrace();
--- 83,105 ----
      setupNewImage();
  
!     for (;;) {
        try {
  	Thread.currentThread().sleep(1000);
  
! 	if (advMsg.get_imgDesc_imgNum() >= numImages
! 	    && numImages != -1)
  	  break;
! 
  	advMsg = DelugeCrc.computeAdvCrc(advMsg);
  	send(advMsg);
  	if (verbose) System.out.print(advMsg);
+ 
+ 	if (!resolvedNodeType) {
+ 	  if (pcAddr == (short)MoteIF.TOS_BCAST_ADDR)
+ 	    pcAddr = TOS_UART_ADDR;
+ 	  else
+ 	    pcAddr = (short)MoteIF.TOS_BCAST_ADDR;
+ 	}
+ 	advMsg.set_sourceAddr(pcAddr);
        } catch (Exception e) {
  	e.printStackTrace();
***************
*** 113,117 ****
  
    public int getNumImages() { 
!     return curImage; 
    }
  
--- 125,129 ----
  
    public int getNumImages() { 
!     return numImages; 
    }
  
***************
*** 158,161 ****
--- 170,178 ----
        int imgNum = pingReply.get_imgDesc_imgNum();
  
+       if (verbose) System.out.print(pingReply);
+ 
+       if (numImages == -1)
+ 	numImages = pingReply.get_imgDesc_numImages();
+ 
        if (pingReplies.get(new Integer(imgNum)) == null) {
  	pingReplies.put(new Integer(imgNum), pingReply);
***************
*** 166,171 ****
        }
  
-       if (verbose) System.out.print(pingReply);
- 
        DelugeReqMsg reqMsg = new DelugeReqMsg();
        reqMsg.set_sourceAddr(pcAddr);
--- 183,186 ----