[Firebug-cvs] firebug/project/src/multihop CollectDataFB.nc,1.5,1.6 Makefile,1.14,1.15

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

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

Modified Files:
	CollectDataFB.nc Makefile 
Log Message:
Added lightsensor module to collect data
application.  Started cleaning up makefile.

Index: CollectDataFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataFB.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CollectDataFB.nc	19 Aug 2003 22:33:42 -0000	1.5
--- CollectDataFB.nc	20 Aug 2003 20:52:14 -0000	1.6
***************
*** 14,18 ****
  implementation {
    components Main, CollectDataMFB, MHSender, TimerWrapper, LedsC, 
!     VirtualComm, ParentSelection, CC1000ControlM; //, RandomLFSR;
  
    Main.StdControl                  -> CollectDataMFB.StdControl;
--- 14,18 ----
  implementation {
    components Main, CollectDataMFB, MHSender, TimerWrapper, LedsC, 
!     VirtualComm, ParentSelection, CC1000ControlM, TaosPhotoM; 
  
    Main.StdControl                  -> CollectDataMFB.StdControl;

Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	19 Aug 2003 22:33:42 -0000	1.14
--- Makefile	20 Aug 2003 20:52:14 -0000	1.15
***************
*** 1,3 ****
! #/* -*- Mode: Makefile; c-basic-indent: 2; indent-tabs-mode: nil -*- */ 
  #/* $Id$ */
  #/*////////////////////////////////////////////////////////*/
--- 1,3 ----
! #/* -*- Mode: Makefile; c-basic-indent: 2; -*- */ 
  #/* $Id$ */
  #/*////////////////////////////////////////////////////////*/
***************
*** 9,12 ****
--- 9,16 ----
  ## This is the Makefile for multihop.
  
+ ifndef XBOWROOT
+ 	echo Please set the XBOWROOT environment variable
+ endif
+ 
  
  UISP = uisp
***************
*** 19,23 ****
  #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 
  
  
--- 23,34 ----
  #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                \
!          -I$(XBOWROOT)/tos/sensorboards/mts400      \
!          -I$(XBOWROOT)/tos/interfaces