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

[Gilman Tolle]

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

Modified Files:
	MultihopTreeBuilder.java 
Log Message:
fixed a bug in one-shot RAM queries, now treeBuilder takes the beacon period on the command line

Index: MultihopTreeBuilder.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/multihop/MultihopTreeBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MultihopTreeBuilder.java	15 Oct 2004 05:01:45 -0000	1.6
--- MultihopTreeBuilder.java	2 Nov 2004 09:04:48 -0000	1.7
***************
*** 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);
***************
*** 59,63 ****
  //	System.out.println(beaconMsg);
  	send(beaconMsg);
! 	Thread.sleep(BEACON_PERIOD*1024);
  
        } catch (Exception e) {
--- 61,65 ----
  //	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);
    }
  }