[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla AgentInjector.java, 1.22.2.1, 1.22.2.2 Makefile, 1.9, 1.9.2.1 PromiscuousListener.java, 1.5, 1.5.2.1 SNInterface.java, 1.12.2.1, 1.12.2.2

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21621

Modified Files:
      Tag: GroupComm
	AgentInjector.java Makefile PromiscuousListener.java 
	SNInterface.java 
Log Message:
Debugged, got basic test to work.

Index: AgentInjector.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/AgentInjector.java,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -d -r1.22.2.1 -r1.22.2.2
*** AgentInjector.java	15 Nov 2006 04:30:39 -0000	1.22.2.1
--- AgentInjector.java	15 Nov 2006 09:39:45 -0000	1.22.2.2
***************
*** 1,711 ****
! // $Id$
! 
! /* Agilla - A middleware for wireless sensor networks.
!  * Copyright (C) 2004, Washington University in Saint Louis
!  * By Chien-Liang Fok.
!  *
!  * Washington University states that Agilla is free software;
!  * you can redistribute it and/or modify it under the terms of
!  * the current version of the GNU Lesser General Public License
!  * as published by the Free Software Foundation.
[...1395 lines suppressed...]
! 		public void run () {
! 			while(true) {
! 				AgillaSetBSMsgJ bsMsg = new AgillaSetBSMsgJ(vID); // notify mote it is a base station
! //				System.out.println("Sending "  + bsMsg);
! 				injector.sendMsg(bsMsg);
! 				try {
! 					Thread.sleep(3000);
! 				} catch(Exception e) {
! 					e.printStackTrace();
! 				}
! 			}
! 		}
! 	}
! 	
! 	private void log(String msg) {
! 		Debugger.dbg("AgentInjector", msg);
! 	}
! 	
! }
! 

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/Makefile,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** Makefile	10 Apr 2006 23:29:22 -0000	1.9
--- Makefile	15 Nov 2006 09:39:45 -0000	1.9.2.1
***************
*** 9,12 ****
--- 9,13 ----
  MSGS = AgillaAddressAckMsg.java \
         AgillaBeaconMsg.java \
+        AgillaProxyBeaconMsg.java \
         AgillaErrorMsg.java \
         AgillaCodeMsg.java \
***************
*** 62,65 ****
--- 63,69 ----
  	$(MIG) -java-classname=$(PACKAGE).messages.AgillaBeaconMsg $(AGILLA)/types/Agilla.h AgillaBeaconMsg -o messages/$@
  	
+ AgillaProxyBeaconMsg.java:
+ 	$(MIG) -java-classname=$(PACKAGE).messages.AgillaProxyBeaconMsg $(AGILLA)/types/Agilla.h AgillaProxyBeaconMsg -o messages/$@
+ 
  AgillaGridSizeMsg.java:
  	$(MIG) -java-classname=$(PACKAGE).messages.AgillaGridSizeMsg $(AGILLA)/types/Agilla.h AgillaGridSizeMsg -o messages/$@

Index: PromiscuousListener.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/PromiscuousListener.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** PromiscuousListener.java	31 May 2006 18:49:25 -0000	1.5
--- PromiscuousListener.java	15 Nov 2006 09:39:45 -0000	1.5.2.1
***************
*** 69,73 ****
   *
   */
! package edu.wustl.mobilab.agilla;

import net.tinyos.message.*;
  import net.tinyos.packet.*;
  import net.tinyos.util.*;
--- 69,74 ----
   *
   */
! package edu.wustl.mobilab.agilla;
! import net.tinyos.message.*;
  import net.tinyos.packet.*;
  import net.tinyos.util.*;
***************
*** 102,105 ****
--- 103,108 ----
  			System.exit(1);
  		}
+ 		
+ 		
  		sni = new SNInterface(true);
  		sni.setMoteIF(moteIF);		

Index: SNInterface.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/SNInterface.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -d -r1.12.2.1 -r1.12.2.2
*** SNInterface.java	15 Nov 2006 04:30:39 -0000	1.12.2.1
--- SNInterface.java	15 Nov 2006 09:39:45 -0000	1.12.2.2
***************
*** 90,93 ****
--- 90,94 ----
  		moteIF.registerListener(new AgillaNbrMsg(), this);
  		moteIF.registerListener(new AgillaBeaconMsg(), this);
+ 		moteIF.registerListener(new AgillaProxyBeaconMsg(), this);
  		//moteIF.registerListener(new AgillaBeaconBSMsg(), this);
  		moteIF.registerListener(new AgillaRxnMsg(), this);
***************
*** 132,135 ****
--- 133,137 ----
  			moteIF.deregisterListener(new AgillaNbrMsg(), this);
  			moteIF.deregisterListener(new AgillaBeaconMsg(), this);
+ 			moteIF.deregisterListener(new AgillaProxyBeaconMsg(), this);
  			//moteIF.deregisterListener(new AgillaBeaconBSMsg(), this);
  			moteIF.deregisterListener(new AgillaRxnMsg(), this);
***************
*** 304,307 ****
--- 306,312 ----
  				msgJ = new AgillaBeaconMsgJ((AgillaBeaconMsg)m);
  				break;
+ 			case AgillaProxyBeaconMsg.AM_TYPE:
+ 				msgJ = new AgillaProxyBeaconMsgJ((AgillaProxyBeaconMsg)m);
+ 				break;
  //			case AM_AGILLABEACONBSMSG:
  //				msgJ = new AgillaBeaconBSMsgJ((AgillaBeaconBSMsg)m);