[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore SampleChunk.h, 1.2, 1.3 SamplingToDataStoreM.nc, 1.1.1.1, 1.2

[Konrad Lorincz]

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

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

Index: SampleChunk.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore/SampleChunk.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SampleChunk.h	17 Dec 2007 20:47:41 -0000	1.2
--- SampleChunk.h	20 Dec 2007 01:29:34 -0000	1.3
***************
*** 44,48 ****
  
  /* Number of samples in a sample chunk */
! #define SAMPLE_CHUNK_NUM_SAMPLES ((BLOCK_DATA_SIZE - 2*sizeof(uint32_t) - 2*sizeof(uint16_t) - sizeof(channelID_t)*MCS_MAX_NBR_CHANNELS_SAMPLED) / sizeof(sample_t))
  
  /* Number of bytes in a sample chunk if packed */
--- 44,48 ----
  
  /* Number of samples in a sample chunk */
! #define SAMPLE_CHUNK_NUM_SAMPLES ((BLOCK_DATA_SIZE - 2*sizeof(uint32_t) - 3*sizeof(uint16_t) - sizeof(channelID_t)*MCS_MAX_NBR_CHANNELS_SAMPLED) / sizeof(sample_t))
  
  /* Number of bytes in a sample chunk if packed */
***************
*** 55,58 ****
--- 55,59 ----
      uint32_t    localTime;
      uint32_t    globalTime;
+     uint16_t    samplingRate;
      uint16_t    timeSynched;         // true or false 
      uint16_t    nbrMultiChanSamples; // Number of samples
***************
*** 61,65 ****
      // determined by the channelIDs map. All map entries that are
      // *not* set to CHAN_INVALID represent an actual channel.
!     channelID_t channelIDs[MCS_MAX_NBR_CHANNELS_SAMPLED];            
  
  #ifdef SAMPLE_CHUNK_PACKED
--- 62,66 ----
      // determined by the channelIDs map. All map entries that are
      // *not* set to CHAN_INVALID represent an actual channel.
!     channelID_t channelIDs[MCS_MAX_NBR_CHANNELS_SAMPLED];
  
  #ifdef SAMPLE_CHUNK_PACKED
***************
*** 76,79 ****
--- 77,81 ----
      scPtr->localTime = 0;
      scPtr->globalTime = 0;
+     scPtr->samplingRate = 0;
      scPtr->timeSynched = 0;
      scPtr->nbrMultiChanSamples = 0;
***************
*** 88,98 ****
      uint16_t i = 0, n = 0;
      printfUART("  --- SampleChunk_print() - for SampleChunk (0x%x) --- \n", scPtr);
!     printfUART("    localTime= %i, globalTime= %i, timeSynched= %i, nbrMultiChanSamples= %i, channelIDs= {", 
!                (uint16_t)scPtr->localTime,  (uint16_t)scPtr->globalTime, (uint8_t)scPtr->nbrMultiChanSamples);  
      for (i = 0; i < MCS_MAX_NBR_CHANNELS_SAMPLED; ++i) {
          if (i < MCS_MAX_NBR_CHANNELS_SAMPLED - 1)
!             {printfUART("%i, ", scPtr->channelIDs[i]);}
          else
!             {printfUART("%i}>", scPtr->channelIDs[i]);}
      }                                          
  
--- 90,100 ----
      uint16_t i = 0, n = 0;
      printfUART("  --- SampleChunk_print() - for SampleChunk (0x%x) --- \n", scPtr);
!     printfUART("    localTime= %lu, globalTime= %lu, samplingRate= %u, timeSynched= %u, nbrMultiChanSamples= %u, channelIDs= {", 
!                scPtr->localTime,  scPtr->globalTime, scPtr->samplingRate, scPtr->nbrMultiChanSamples);  
      for (i = 0; i < MCS_MAX_NBR_CHANNELS_SAMPLED; ++i) {
          if (i < MCS_MAX_NBR_CHANNELS_SAMPLED - 1)
!             {printfUART("%u, ", scPtr->channelIDs[i]);}
          else
!             {printfUART("%u}>", scPtr->channelIDs[i]);}
      }                                          
  
***************
*** 103,113 ****
          if (n % MCS_MAX_NBR_CHANNELS_SAMPLED == 0)
              {printfUART(" {", "");}
!         printfUART("%i ", scPtr->samples[n]);
  /*         printfUART("{", (uint16_t)scPtr->timeStamp);   */
  /*         for (i = 0; i < MCS_MAX_NBR_CHANNELS_SAMPLED; ++i) { */
  /*             if (i < MCS_MAX_NBR_CHANNELS_SAMPLED - 1) */
! /*                 {printfUART("%i, ", scPtr->samples[n]);} */
  /*             else */
! /*                 {printfUART("%i},  ", scPtr->samples[n]);} */
  /*         }                           */
      }
--- 105,115 ----
          if (n % MCS_MAX_NBR_CHANNELS_SAMPLED == 0)
              {printfUART(" {", "");}
!         printfUART("%u ", scPtr->samples[n]);
  /*         printfUART("{", (uint16_t)scPtr->timeStamp);   */
  /*         for (i = 0; i < MCS_MAX_NBR_CHANNELS_SAMPLED; ++i) { */
  /*             if (i < MCS_MAX_NBR_CHANNELS_SAMPLED - 1) */
! /*                 {printfUART("%u, ", scPtr->samples[n]);} */
  /*             else */
! /*                 {printfUART("%u},  ", scPtr->samples[n]);} */
  /*         }                           */
      }

Index: SamplingToDataStoreM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/samplingToDataStore/SamplingToDataStoreM.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SamplingToDataStoreM.nc	22 Aug 2007 00:43:55 -0000	1.1.1.1
--- SamplingToDataStoreM.nc	20 Dec 2007 01:29:34 -0000	1.2
***************
*** 154,160 ****
              scPtr->localTime =  call GlobalTime.getLocalTime(); //call LocalTime.read();
              scPtr->timeSynched = call GlobalTime.getGlobalTime(&(scPtr->globalTime));  // set to 0 until we implement GlobalTime (most likely FTSP)
  
!             NOprintfUART("SamplingToDataStoreM.addNewSample() - localTime= %lu, globalTime= %lu, timeSynched= %u\n", 
!                        scPtr->localTime, scPtr->globalTime, scPtr->timeSynched);
  
              for (i = 0; i < nbrChannels; ++i)
--- 154,161 ----
              scPtr->localTime =  call GlobalTime.getLocalTime(); //call LocalTime.read();
              scPtr->timeSynched = call GlobalTime.getGlobalTime(&(scPtr->globalTime));  // set to 0 until we implement GlobalTime (most likely FTSP)
+             scPtr->samplingRate = MERCURY_SAMPLING_RATE;
  
!             NOprintfUART("SamplingToDataStoreM.addNewSample() - localTime= %lu, globalTime= %lu, samplingRate= %u, timeSynched= %u\n", 
!                        scPtr->localTime, scPtr->globalTime, scPtr->samplingRate, scPtr->timeSynched);
  
              for (i = 0; i < nbrChannels; ++i)