- Added support for the temperature sensor (using semaphores/monitors to overcome...

diff --git a/tos/platforms/eyesIFX/sensors/TempExtSensorC.nc b/tos/platforms/eyesIFX/sensors/TempExtSensorC.nc
index 543827797388628259e10523b400f6cce52228e1..6546e2ec48ab3ac2d5c9fc403a4b49b42ce5afe4 100644 (file)
--- a/tos/platforms/eyesIFX/sensors/TempExtSensorC.nc
+++ b/tos/platforms/eyesIFX/sensors/TempExtSensorC.nc
@@ -53,14 +53,26 @@ generic configuration TempExtSensorC()
 }
 implementation
 {
-  components SensorSettingsC as Settings;
-             
+  components SensorSettingsC as Settings;  
+  
   components new AdcReadClientC() as AdcReadClient;
-  Read = AdcReadClient;
+  //Read = AdcReadClient;
   AdcReadClient.AdcConfigure -> Settings.AdcConfigure[TEMP_SENSOR_DEFAULT];
   
+  
   components new AdcReadNowClientC() as AdcReadNowClient;
   ReadNow = AdcReadNowClient;
-  ReadNowResource = AdcReadNowClient;
+  //ReadNowResource = AdcReadNowClient;
   AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[TEMP_SENSOR_DEFAULT];
+  
+  components HplMsp430GeneralIOC as MspGeneralIO;
+  components new Msp430GpioC() as TEMP;
+  TEMP -> MspGeneralIO.Port60;
+  
+  components TempExtSensorP;
+  Read = TempExtSensorP.Read;
+  TempExtSensorP.AdcRead -> AdcReadClient;
+  ReadNowResource = TempExtSensorP.ReadNowResource;
+  TempExtSensorP.AdcResource -> AdcReadNowClient;
+  TempExtSensorP.TEMP -> TEMP;
 }

diff --git a/tos/platforms/eyesIFX/sensors/TempExtSensorP.nc b/tos/platforms/eyesIFX/sensors/TempExtSensorP.nc
new file mode 100644 (file)
index 0000000..8e0eba8
--- /dev/null
+++ b/tos/platforms/eyesIFX/sensors/TempExtSensorP.nc
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2007, Technische Universitaet Berlin
+ * 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 the Technische Universitaet Berlin 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.
+ *
+ * - Revision -------------------------------------------------------------
+ * @author: Philipp Huppertz (huppertz@tkn.tu-berlin.de)
+ * ========================================================================
+ */
+    
+/**
+ * The temperature sensor implementation on eyesIFX.
+ * It just starts the sensor if there is an request and 
+ * stops when there are no open requests left
+ * (this is done via a monitor).
+ *  
+ * @author Philipp Huppertz <huppertz@tkn.tu-berlin.de>
+ *
+ */
+module TempExtSensorP {
+  provides interface Read<uint16_t>;
+  provides interface Resource as ReadNowResource;
+
+  uses interface GeneralIO as TEMP;
+  uses interface Resource as AdcResource;
+  uses interface Read<uint16_t> as AdcRead;
+}
+
+implementation {
+
+  uint8_t tempMonitor = 0;
+  
+  
+  command error_t Read.read() {
+    error_t error = call AdcRead.read();
+    if (error == SUCCESS) {
+      atomic {
+       if (tempMonitor == 0) {
+                 call TEMP.set();
+        }
+        ++tempMonitor;
+      }
+    }
+    return error;
+  }
+   
+  event void AdcRead.readDone(error_t result, uint16_t val) {
+    atomic {
+      --tempMonitor;
+       if (tempMonitor == 0) {
+         call TEMP.clr();
+       }
+    }
+    signal Read.readDone(result, val);
+  }
+  
+  async command error_t ReadNowResource.request() {
+    error_t error = call AdcResource.request();
+    if (error == SUCCESS) {
+      atomic {
+       if (tempMonitor == 0) {
+          call TEMP.set();
+        }
+        ++tempMonitor;
+      }
+    }   
+    return error;
+  }
+
+  async command error_t ReadNowResource.immediateRequest() {
+    error_t error = call AdcResource.immediateRequest();
+    if (error == SUCCESS) {
+      atomic {
+       if (tempMonitor == 0) {
+          call TEMP.set();
+        }
+        ++tempMonitor;
+      }
+    }   
+    return error;
+  }
+
+  event void AdcResource.granted() {
+    signal ReadNowResource.granted();
+  }
+   
+  async command error_t ReadNowResource.release() {
+    error_t error = call AdcResource.release();
+    if (error == SUCCESS) {
+      atomic {
+        --tempMonitor;
+        if (tempMonitor == 0) {
+          call TEMP.clr();
+        }
+      }
+       }
+    return error;
+  }
+
+  async command bool ReadNowResource.isOwner() {
+    return call AdcResource.isOwner();
+  }
+  
+  
+  default event void ReadNowResource.granted() {};
+}
+