[Firebug-cvs] firebug/project/src/multihop CollectDataFB.nc,1.4,1.5 CollectDataMFB.nc,1.9,1.10 Makefile,1.13,1.14

[<do...@us...>]

Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv2636

Modified Files:
	CollectDataFB.nc CollectDataMFB.nc Makefile 
Log Message:
Added power setting function to data 
collection.

Index: CollectDataFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataFB.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CollectDataFB.nc	2 Jul 2003 00:47:50 -0000	1.4
--- CollectDataFB.nc	19 Aug 2003 22:33:42 -0000	1.5
***************
*** 3,7 ****
  
  /**
!  * Author: Terence Tong, Alec Woo, Max Min Chen
   */
  
--- 3,7 ----
  
  /**
!  * Author: Terence Tong, Alec Woo, Max Min Chen, David M. Doolin
   */
  
***************
*** 13,17 ****
  
  implementation {
!   components Main, CollectDataMFB, MHSender, TimerWrapper, LedsC, VirtualComm, ParentSelection;
    Main.StdControl                  -> CollectDataMFB.StdControl;
    //CollectDataMFB.MultiHopSend      -> MHSender.MultiHopSend[MH_STATISTIC_TYPE];
--- 13,19 ----
  
  implementation {
!   components Main, CollectDataMFB, MHSender, TimerWrapper, LedsC, 
!     VirtualComm, ParentSelection, CC1000ControlM; //, RandomLFSR;
! 
    Main.StdControl                  -> CollectDataMFB.StdControl;
    //CollectDataMFB.MultiHopSend      -> MHSender.MultiHopSend[MH_STATISTIC_TYPE];
***************
*** 23,52 ****
    Main.StdControl                  -> MHSender.StdControl;
    //CollectDataMFB.Random            -> RandomLFSR;
  }
  
- /*
- includes RoutingStackShared;
- configuration CollectDataFB {
-   
- }
- 
- implementation {
- 
-    components Main,
-               CollectDataMFB,
-               MHDispatcher,
-               TimerWrapper, 
-               LedsC, 
-               BcastCommand,
-               RandomLFSR;
-      
-    Main.StdControl             -> CollectDataMFB.StdControl;
- 
-    CollectDataMFB.MultiHopSend -> MHDispatcher.MultiHopSend[unique("MHDispathcer")];
-    CollectDataMFB.Timer        -> TimerWrapper.Timer[unique("Timer")];
-    CollectDataMFB.Leds         -> LedsC;
-    CollectDataMFB.HandleBcast  -> BcastCommand.HandleBcast;
-    CollectDataMFB.Random       -> RandomLFSR;
-   
- }
- */
--- 25,29 ----
    Main.StdControl                  -> MHSender.StdControl;
    //CollectDataMFB.Random            -> RandomLFSR;
+   CollectDataMFB.CC1000Control     -> CC1000ControlM;
  }
  

Index: CollectDataMFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataMFB.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CollectDataMFB.nc	10 Jul 2003 09:05:26 -0000	1.9
--- CollectDataMFB.nc	19 Aug 2003 22:33:42 -0000	1.10
***************
*** 39,42 ****
--- 39,43 ----
      //interface HandleBcast;
      //interface Random;
+     interface CC1000Control;
  
    }
***************
*** 72,75 ****
--- 73,77 ----
      }
      call Timer.start(TIMER_REPEAT, DATA_FREQ);
+     call CC1000Control.SetRFPower(255);
      return SUCCESS;
    }
***************
*** 165,169 ****
      return SUCCESS;
    }
!   
!  
  }
--- 167,170 ----
      return SUCCESS;
    }
! 
  }

Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	2 Jul 2003 00:47:50 -0000	1.13
--- Makefile	19 Aug 2003 22:33:42 -0000	1.14
***************
*** 17,22 ****
  #ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
  #INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) 
  
- INCLUDES=-I$(TOSROOT)/Blast-0.1/Sender -I$(TOSROOT)/Blast-0.1/Interface -I$(TOSROOT)/Blast-0.1/DataStructure -I$(TOSROOT)/Blast-0.1/VirtualComm -I$(TOSROOT)/Blast-0.1/ParentSelection -I$(TOSROOT)/tinyos-1.x/tos
  
  PFLAGS := $(PFLAGS) -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d
--- 17,25 ----
  #ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
  #INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) 
+ #CC1000=-I/cygdrive/d/tinyos-1.x/tos/platform/mica2
+ 
+ INCLUDES=-I$(TOSROOT)/Blast-0.1/Sender -I$(TOSROOT)/Blast-0.1/Interface -I$(TOSROOT)/Blast-0.1/DataStructure -I$(TOSROOT)/Blast-0.1/VirtualComm  -I$(TOSROOT)/Blast-0.1/ParentSelection -I$(TOSROOT)/tinyos-1.x/tos 
+ 
  
  
  PFLAGS := $(PFLAGS) -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d