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

[Kristin Wright]

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

Modified Files:
      Tag: tos-1-1-8-candidate
	MultihopConnector.java MultihopTreeBuilder.java 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: MultihopConnector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop/MultihopConnector.java,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -C2 -d -r1.13 -r1.13.4.1
*** MultihopConnector.java	7 Sep 2004 22:15:39 -0000	1.13
--- MultihopConnector.java	11 Nov 2004 13:43:29 -0000	1.13.4.1
***************
*** 51,56 ****
--- 51,58 ----
      cmdMsg.set_llAck((short)1);
  
+     /*
      System.err.println("Enabling TOSBase with link-layer ACKs");
      send(cmdMsg);
+     */
    }
  

Index: MultihopTreeBuilder.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop/MultihopTreeBuilder.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** MultihopTreeBuilder.java	21 Sep 2004 03:57:53 -0000	1.5
--- MultihopTreeBuilder.java	11 Nov 2004 13:43:29 -0000	1.5.2.1
***************
*** 12,21 ****
    private MoteIF moteIF;
  
!   private static final int BEACON_PERIOD = 32;
    private int spAddr;
    private int beaconSeqno = 1;
    MultihopBeaconMsg beaconMsg = new MultihopBeaconMsg();
    
!   MultihopTreeBuilder() {
  
      String moteid = Env.getenv("MOTEID");
--- 12,23 ----
    private MoteIF moteIF;
  
!   private static final int BEACON_PERIOD = 8*1024;
!   private int beaconPeriod;
    private int spAddr;
    private int beaconSeqno = 1;
    MultihopBeaconMsg beaconMsg = new MultihopBeaconMsg();
    
!   MultihopTreeBuilder(int period) {
!     beaconPeriod = period;
  
      String moteid = Env.getenv("MOTEID");
***************
*** 27,31 ****
  
      beaconSeqno = 0;
!     beaconMsg.set_beaconPeriod(BEACON_PERIOD);
      beaconMsg.set_parent(0xffff);
      beaconMsg.set_sourceAddr(spAddr);
--- 29,33 ----
  
      beaconSeqno = 0;
!     beaconMsg.set_beaconPeriod(beaconPeriod);
      beaconMsg.set_parent(0xffff);
      beaconMsg.set_sourceAddr(spAddr);
***************
*** 54,63 ****
        try {
  
! 	beaconMsg.set_beaconSeqno((short)beaconSeqno++);    
  	beaconMsg.set_timestamp(System.currentTimeMillis());
  
  //	System.out.println(beaconMsg);
  	send(beaconMsg);
! 	Thread.sleep(BEACON_PERIOD*1024);
  
        } catch (Exception e) {
--- 56,65 ----
        try {
  
! 	//	beaconMsg.set_beaconSeqno((short)beaconSeqno++);    
  	beaconMsg.set_timestamp(System.currentTimeMillis());
  
  //	System.out.println(beaconMsg);
  	send(beaconMsg);
! 	Thread.sleep(beaconPeriod);
  
        } catch (Exception e) {
***************
*** 80,90 ****
  
    public static void main(String args[]) {
  
      if (args.length < 0) {
!       System.err.println("usage: java net.tinyos.multihop.MultihopTreeBuilder");
        System.exit(1);
      }
  
!     MultihopTreeBuilder mtb = new MultihopTreeBuilder();
    }
  }
--- 82,97 ----
  
    public static void main(String args[]) {
+     
+     int period = BEACON_PERIOD;
  
      if (args.length < 0) {
!       System.err.println("usage: java net.tinyos.multihop.MultihopTreeBuilder [beacon period (ms)]");
        System.exit(1);
      }
  
!     if (args.length == 1) {
!       period = Integer.parseInt(args[0]);
!     }
!     MultihopTreeBuilder mtb = new MultihopTreeBuilder(period);
    }
  }