Convenience components that multi-sample an ADC pin for oversampling.

diff --git a/tos/platforms/tmirws/sensors/MultiSampleC.nc b/tos/platforms/tmirws/sensors/MultiSampleC.nc
new file mode 100644 (file)
index 0000000..50069c8
--- /dev/null
+++ b/tos/platforms/tmirws/sensors/MultiSampleC.nc
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2008, Titanium Mirror, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of Titanium Mirror, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+/**
+ * A generic component that multiply samples via the ADC, returning the sum of
+ * ADC sample values.
+ * 
+ * @author R. Steve McKown <smckown@gmail.com>
+ */
+ 
+#include <Msp430Adc12.h>
+
+generic configuration MultiSampleC(typedef val_t @integer(), uint16_t count) {
+  provides {
+    interface Get<uint16_t> as Count;
+    interface Read<val_t>;
+  }
+  uses interface AdcConfigure<const msp430adc12_channel_config_t*>;
+}
+implementation {
+  components new MultiSampleP(val_t, count);
+  Count = MultiSampleP;
+  Read = MultiSampleP;
+
+  components new AdcReadStreamClientC();
+  AdcConfigure = AdcReadStreamClientC;
+  MultiSampleP.ReadStream -> AdcReadStreamClientC;
+}

diff --git a/tos/platforms/tmirws/sensors/MultiSampleP.nc b/tos/platforms/tmirws/sensors/MultiSampleP.nc
new file mode 100644 (file)
index 0000000..031f4ba
--- /dev/null
+++ b/tos/platforms/tmirws/sensors/MultiSampleP.nc
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2008, Titanium Mirror, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - Neither the name of Titanium Mirror, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+/**
+ * A generic component that multiply samples via the ADC, returning the sum of
+ * ADC sample values.
+ * 
+ * @author R. Steve McKown <smckown@gmail.com>
+ */
+ 
+generic module MultiSampleP(typedef val_t @integer(), uint16_t count) @safe()
+{
+  provides {
+    interface Get<uint16_t> as Count;
+    interface Read<val_t>;
+  }
+  uses interface ReadStream<uint16_t>;
+}
+implementation
+{
+  bool busy;
+  uint16_t values[count];
+
+  command uint16_t Count.get()
+  {
+    return count;
+  }
+
+  command error_t Read.read()
+  {
+    if (busy)
+      return EBUSY;
+
+    if (call ReadStream.postBuffer(values, count) != SUCCESS ||
+       call ReadStream.read(0) != SUCCESS)
+      return FAIL;
+
+    busy = TRUE;
+    return SUCCESS;
+  }
+
+  void signalReadDone(error_t error)
+  {
+    val_t sum = 0;
+
+    if (error == SUCCESS) {
+      uint16_t i;
+
+      /* Average all the incoming readings */
+      for (i = 0; i < count; i++)
+         sum += values[i];
+    }
+    busy = FALSE;
+    signal Read.readDone(error, sum);
+  }
+
+  event void ReadStream.bufferDone(error_t error, uint16_t* buf,
+      uint16_t _count)
+  {
+    /* FIXME: count comes back as zero, so ignore it.  Up to 16 reads work. */
+    if (error != SUCCESS /*|| _count != count*/)
+      signalReadDone(FAIL);
+  }
+
+  event void ReadStream.readDone(error_t error, uint32_t usActualPeriod)
+  {
+    signalReadDone(error);
+  } 
+}