Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / msp430 / adc12 / Msp430Adc12MultiChannel.nc

diff --git a/tos/chips/msp430/adc12/Msp430Adc12MultiChannel.nc b/tos/chips/msp430/adc12/Msp430Adc12MultiChannel.nc
index 0ded55e31e6ded9ea74f6907fd35be892e0388f2..aff85f6f9ee0f11f42e45cc32395209b9ffb4a3a 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12MultiChannel.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12MultiChannel.nc
@@ -74,13 +74,10 @@ interface Msp430Adc12MultiChannel
    * (numMemctl+1) must be zero. For example, to sample every channel twice use
    * numSamples = (numMemctl+1) * 2
    *
-   * @param jiffies Sampling period per sequence in terms of clock ticks of
-   * "sampcon_ssel" and input divider "sampcon_id". A sequence of (numMemctl+1)
-   * is always sampled as fast as possible and <code>jiffies</code> specifies
-   * the time between those sequences. For example, if numSamples =
-   * (numMemctl+1) * 5, then dataReady() will be signalled after (approx.)
-   * 5*jiffies clock ticks after the call to getData() and each set of
-   * numMemctl+1 channels was sampled at (almost) the same time.
+   * @param jiffies Sampling period in terms of clock ticks of "sampcon_ssel"
+   * and input divider "sampcon_id". Samples are taken equally-spaced in
+   * time iterating round-robin over the channels (different channels are  
+   * not sampled simultaneously but one after another).
    *
    * @return SUCCESS means that the ADC was configured successfully and
    * <code>getData()</code> can be called to start the conversion.