[Firebug-cvs] fireboard/beta/fireworks/apps/DataCollection DataCollection.nc,1.2,1.3 DataCollectionM.nc,1.2,1.3

[Karthik D. <da...@us...>]

Update of /cvsroot/firebug/fireboard/beta/fireworks/apps/DataCollection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617

Modified Files:
	DataCollection.nc DataCollectionM.nc 
Log Message:
Working temperature and pressure sensors

Index: DataCollectionM.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/DataCollection/DataCollectionM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataCollectionM.nc	29 Aug 2005 00:25:53 -0000	1.2
--- DataCollectionM.nc	29 Aug 2005 18:52:51 -0000	1.3
***************
*** 321,325 ****
  	cReading->src = TOS_LOCAL_ADDRESS;
  	cReading->parentaddr = call RouteControl.getParent();
! 	for(i=0;i<=4;i++) 
  	  cReading->calibration[i]=cal[i];
  	cReading->seq_no = seqno++;
--- 321,325 ----
  	cReading->src = TOS_LOCAL_ADDRESS;
  	cReading->parentaddr = call RouteControl.getParent();
! 	for(i=0;i<4;i++) 
  	  cReading->calibration[i]=cal[i];
  	cReading->seq_no = seqno++;

Index: DataCollection.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/fireworks/apps/DataCollection/DataCollection.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataCollection.nc	29 Aug 2005 00:25:53 -0000	1.2
--- DataCollection.nc	29 Aug 2005 18:52:51 -0000	1.3
***************
*** 56,60 ****
    DataCollectionM.HumidityControl -> HumidityC;
    DataCollectionM.Humidity -> HumidityC.Humidity;
!   DataCollectionM.Temperature -> HumidityC.Temperature;
    //  DataCollectionM.TSR -> HamamatsuC.TSR;
    //  DataCollectionM.PAR -> HamamatsuC.PAR;
--- 56,61 ----
    DataCollectionM.HumidityControl -> HumidityC;
    DataCollectionM.Humidity -> HumidityC.Humidity;
!   //  DataCollectionM.Temperature -> HumidityC.Temperature;
!   DataCollectionM.Temperature -> IntersemaPressure.Temperature;
    //  DataCollectionM.TSR -> HamamatsuC.TSR;
    //  DataCollectionM.PAR -> HamamatsuC.PAR;