[Tinyos-commits] CVS: tinyos-1.x/tools/java/net/tinyos/deluge Pinger.java, 1.5, 1.6

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/deluge
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4940

Modified Files:
	Pinger.java 
Log Message:

Put back in functionality for pinger to interrogate a single node at a
time. Got lost in the mix somewhere during the summer.

Also added more run-time feedback during the ping progress.



Index: Pinger.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/deluge/Pinger.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Pinger.java	27 Aug 2005 22:29:52 -0000	1.5
--- Pinger.java	11 Nov 2005 00:20:25 -0000	1.6
***************
*** 134,139 ****
        try {
  	attempts++;
! 	if ( attempts > MAX_ATTEMPTS )
  	  dest = MoteIF.TOS_BCAST_ADDR;
  
  	if ( ( curImage >= numImages && numImages != -1) )
--- 134,141 ----
        try {
  	attempts++;
! 	if ( attempts > MAX_ATTEMPTS ) {
! 	  attempts = 0;
  	  dest = MoteIF.TOS_BCAST_ADDR;
+ 	}
  
  	if ( ( curImage >= numImages && numImages != -1) )
***************
*** 207,210 ****
--- 209,214 ----
      pktsReceived = 0;
      curImage++;
+     System.out.print( "\r                                                      ");
+     System.out.print( "\rGetting data for image [" + curImage + "] " );
      skipNextAdv = true;
      if ( curImage < numImages || numImages == -1 ) {
***************
*** 351,354 ****
--- 355,359 ----
  			 pktNum*DelugeConsts.DELUGE_PKT_PAYLOAD_SIZE, 
  			 DelugeConsts.DELUGE_PKT_PAYLOAD_SIZE);
+ 	System.out.print( "." );
  	pktsReceived++;