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 38ff00c7551d7671f3d9a572fb92eef98985ebad..aff85f6f9ee0f11f42e45cc32395209b9ffb4a3a 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12MultiChannel.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12MultiChannel.nc
@@ -75,7 +75,9 @@ interface Msp430Adc12MultiChannel
    * numSamples = (numMemctl+1) * 2
    *
    * @param jiffies Sampling period in terms of clock ticks of "sampcon_ssel"
-   * and input divider "sampcon_id".
+   * 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.