Swapping HEAD and DEVEL branches

[tinyos-2.x.git] / tos / sensorboards / im2sb / SensirionSht11C.nc

diff --git a/tos/sensorboards/im2sb/SensirionSht11C.nc b/tos/sensorboards/im2sb/SensirionSht11C.nc
index d5e25a391c49a1d8f6e061696a46128a17d11232..9fa48fcb076918f6c7389a49ed19da2892574504 100644 (file)
--- a/tos/sensorboards/im2sb/SensirionSht11C.nc
+++ b/tos/sensorboards/im2sb/SensirionSht11C.nc
@@ -44,9 +44,10 @@
  */
 
 generic configuration SensirionSht11C() {
+  provides interface SplitControl;
   provides interface Read<uint16_t> as Temperature;
   provides interface Read<uint16_t> as Humidity;
-  //provides interface HalSht11Advanced;
+  provides interface HalSht11Advanced;
 }
 implementation {
   components new SensirionSht11ReaderP();
@@ -59,14 +60,15 @@ implementation {
   enum { TEMP_KEY = unique("Sht11.Resource") };
   enum { HUM_KEY = unique("Sht11.Resource") };
 
+  SplitControl = HalSensirionSht11C;
   SensirionSht11ReaderP.TempResource -> HalSensirionSht11C.Resource[ TEMP_KEY ];
   SensirionSht11ReaderP.Sht11Temp -> HalSensirionSht11C.SensirionSht11[ TEMP_KEY ];
   SensirionSht11ReaderP.HumResource -> HalSensirionSht11C.Resource[ HUM_KEY ];
   SensirionSht11ReaderP.Sht11Hum -> HalSensirionSht11C.SensirionSht11[ HUM_KEY ];
 
-  //enum { ADV_KEY = unique("Sht11.Resource") };
-  //components HalSht11ControlP;
-  //HalSht11Advanced = HalSht11ControlP;
-  //HalSht11ControlP.Resource -> HalSensirionSht11C.Resource[ ADV_KEY ];
-  //HalSht11ControlP.SensirionSht11 -> HalSensirionSht11C.SensirionSht11[ ADV_KEY ];
+  enum { ADV_KEY = unique("Sht11.Resource") };
+  components HalSht11ControlP;
+  HalSht11Advanced = HalSht11ControlP;
+  HalSht11ControlP.Resource -> HalSensirionSht11C.Resource[ ADV_KEY ];
+  HalSht11ControlP.SensirionSht11 -> HalSensirionSht11C.SensirionSht11[ ADV_KEY ];
 }