Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / sensorboards / tmote_onboard / CSensirionSht11P.nc

diff --git a/tos/lib/tosthreads/sensorboards/tmote_onboard/CSensirionSht11P.nc b/tos/lib/tosthreads/sensorboards/tmote_onboard/CSensirionSht11P.nc
index 38ba3e80f6bf2cb29f710c12e3d8ac10e66dbf42..448d668150c326c3cec3506d5277d5ae2af9adeb 100644 (file)
--- a/tos/lib/tosthreads/sensorboards/tmote_onboard/CSensirionSht11P.nc
+++ b/tos/lib/tosthreads/sensorboards/tmote_onboard/CSensirionSht11P.nc
@@ -42,16 +42,32 @@ module CSensirionSht11P {
   }
 }
 implementation {
-  error_t sensirionSht11_humidity_read(uint16_t* val) @C() @spontaneous() {
+  error_t sensirionSht11_humidity_read(uint16_t* val) @C() AT_SPONTANEOUS {
     return call Humidity.read(val);
   }
-  uint8_t sensirionSht11_humidity_getNumBits() @C() @spontaneous() {
+  uint8_t sensirionSht11_humidity_getNumBits() @C() AT_SPONTANEOUS {
     return call HumidityMetadata.getSignificantBits();
   }
-  error_t sensirionSht11_temperature_read(uint16_t* val) @C() @spontaneous() {
+  error_t sensirionSht11_temperature_read(uint16_t* val) @C() AT_SPONTANEOUS {
     return call Temperature.read(val);
   }
-  uint8_t sensirionSht11_temperature_getNumBits() @C() @spontaneous() {
+  uint8_t sensirionSht11_temperature_getNumBits() @C() AT_SPONTANEOUS {
     return call TemperatureMetadata.getSignificantBits();
   }
+  
+  default command error_t Humidity.read(uint16_t* val) {
+    return FAIL;
+  }
+
+  default command uint8_t HumidityMetadata.getSignificantBits() {
+    return 0;
+  }
+  
+  default command error_t Temperature.read(uint16_t* val) {
+    return FAIL;
+  }
+
+  default command uint8_t TemperatureMetadata.getSignificantBits() {
+    return 0;
+  }
 }