[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/realTimeSamples RealTimeSamplesM.nc, 1.2, 1.3

[Konrad Lorincz]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/realTimeSamples
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12615/realTimeSamples

Modified Files:
	RealTimeSamplesM.nc 
Log Message:
Added support for sampling multiple motes at different frequencies

Index: RealTimeSamplesM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/realTimeSamples/RealTimeSamplesM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RealTimeSamplesM.nc	17 Dec 2007 20:47:41 -0000	1.2
--- RealTimeSamplesM.nc	20 Dec 2007 01:29:34 -0000	1.3
***************
*** 120,123 ****
--- 120,124 ----
                  // (a) Swap buffers
                  TOS_Msg *sendTOSMsgPtr = currTOSMsgPtr;                
+                 uint16_t i = 0;
                  atomic {
                      currTOSMsgPtr = nextTOSMsgPtr;
***************
*** 127,130 ****
--- 128,138 ----
                      currSamplingMsgPtr->timeStamp = call LocalTime.read() - startTime;
                      currSamplingMsgPtr->nbrSamples = 0;
+                     currSamplingMsgPtr->samplingRate = MERCURY_SAMPLING_RATE/REALTIMESAMPLES_DOWNSAMPLE_FACTOR;
+                     for (i = 0; i < nbrChannels; ++i)
+                         currSamplingMsgPtr->channelIDs[i] = MERCURY_CHANS[i];
+                     // Set remaining channel map entries to invalid
+                     for (; i < MCS_MAX_NBR_CHANNELS_SAMPLED; ++i)
+                         currSamplingMsgPtr->channelIDs[i] = CHAN_INVALID;
+ 
                      sampleIndex = 0;
                  }