[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/components AgentMgrC.nc, 1.10, 1.11 AgentMgrM.nc, 1.25, 1.26

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4883/components

Modified Files:
	AgentMgrC.nc AgentMgrM.nc 
Log Message:
Added Location heartbeat.



Index: AgentMgrC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/AgentMgrC.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AgentMgrC.nc	6 Apr 2006 02:10:05 -0000	1.10
--- AgentMgrC.nc	9 Apr 2006 00:02:56 -0000	1.11
***************
*** 106,109 ****
--- 106,112 ----
    components LocationMgrC;
  
+   components LocationReporterC;
+   components TimerC;
+ 
    #if ENABLE_EXP_LOGGING
      components ExpLoggerC;
***************
*** 118,121 ****
--- 121,126 ----
    StdControl = RxnMgrProxy;
    StdControl = LEDBlinkerC;
+   StdControl = TimerC;
+   StdControl = LocationReporterC;
    
    AgentMgrM.CodeMgrI -> CodeMgrC;
***************
*** 134,137 ****
--- 139,145 ----
    //AgentMgrM.RadioControl -> CC1000RadioC.StdControl;  
  
+   AgentMgrM.LocationReporterI -> LocationReporterC;
+   AgentMgrM.LocationUpdateTimer -> TimerC.Timer[unique("Timer")];
+   
    #if ENABLE_EXP_LOGGING
      AgentMgrM.ExpLoggerI -> ExpLoggerC;

Index: AgentMgrM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/components/AgentMgrM.nc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** AgentMgrM.nc	8 Apr 2006 21:27:33 -0000	1.25
--- AgentMgrM.nc	9 Apr 2006 00:02:56 -0000	1.26
***************
*** 68,71 ****
--- 68,74 ----
      interface LEDBlinkerI;
  
+     interface LocationReporterI;
+     interface Timer as LocationUpdateTimer; // location update heartbeat 
+ 
      #if ENABLE_EXP_LOGGING
        interface ExpLoggerI;
***************
*** 116,119 ****
--- 119,123 ----
         }
      #endif
+     call LocationUpdateTimer.start(TIMER_REPEAT, AGILLA_LOCATION_UPDATE_TIMER);
      dbg(DBG_USR1, "AgentMgrI.start(): Agilla host %i started...\n", TOS_LOCAL_ADDRESS);
      return SUCCESS;
***************
*** 475,478 ****
--- 479,495 ----
      return SUCCESS;
    }*/
+   
+   
+   /**
+    * Send a location update heartbeat to the base station.
+    */
+   event result_t LocationUpdateTimer.fired() {
+     int i;
+     for (i=0; i < AGILLA_NUM_AGENTS; i++) {
+       if (agents[i].state != AGILLA_STATE_HALT)
+         call LocationReporterI.updateLocation(&agents[i]);
+     }
+     return SUCCESS;    
+   }
  }