[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop MultihopTreeBuilder.java, 1.4, 1.5

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23049/java/net/tinyos/multihop

Modified Files:
	MultihopTreeBuilder.java 
Log Message:
* MultiHopRSSI will now use the LQI indicator available on the CC2420
radio. This may suggest a name change. Any suggestions?

* The MultiHopRSSI tree construction message now can have a
user-settable period. It's included in the message.




Index: MultihopTreeBuilder.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop/MultihopTreeBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MultihopTreeBuilder.java	5 Aug 2004 01:16:35 -0000	1.4
--- MultihopTreeBuilder.java	21 Sep 2004 03:57:53 -0000	1.5
***************
*** 12,15 ****
--- 12,16 ----
    private MoteIF moteIF;
  
+   private static final int BEACON_PERIOD = 32;
    private int spAddr;
    private int beaconSeqno = 1;
***************
*** 26,30 ****
  
      beaconSeqno = 0;
!     
      beaconMsg.set_parent(0xffff);
      beaconMsg.set_sourceAddr(spAddr);
--- 27,31 ----
  
      beaconSeqno = 0;
!     beaconMsg.set_beaconPeriod(BEACON_PERIOD);
      beaconMsg.set_parent(0xffff);
      beaconMsg.set_sourceAddr(spAddr);
***************
*** 58,62 ****
  //	System.out.println(beaconMsg);
  	send(beaconMsg);
! 	Thread.sleep(32768);
  
        } catch (Exception e) {
--- 59,63 ----
  //	System.out.println(beaconMsg);
  	send(beaconMsg);
! 	Thread.sleep(BEACON_PERIOD*1024);
  
        } catch (Exception e) {