Swapping HEAD and DEVEL branches

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

diff --git a/tos/sensorboards/im2sb/HplSensirionSht11C.nc b/tos/sensorboards/im2sb/HplSensirionSht11C.nc
index 94045358a8e2df36087ba76b31f45d225340d2e6..b32e5f6329d60a737371684142ac01d503a17cca 100644 (file)
--- a/tos/sensorboards/im2sb/HplSensirionSht11C.nc
+++ b/tos/sensorboards/im2sb/HplSensirionSht11C.nc
@@ -43,7 +43,7 @@
 #include <im2sb.h>
 
 configuration HplSensirionSht11C {
-  provides interface Init;
+  provides interface SplitControl;
   provides interface Resource[ uint8_t id ];
   provides interface GeneralIO as DATA;
   provides interface GeneralIO as SCK;
@@ -56,7 +56,15 @@ implementation {
   SCK = GeneralIOC.GeneralIO[GPIO_SHT11_CLK];
   InterruptDATA = GeneralIOC.GpioInterrupt[GPIO_SHT11_DATA];
 
-  components new FcfsArbiterC( "Sht11.Resource" ) as Arbiter;
-  Init = Arbiter;
+  components HplSensirionSht11P;
+  SplitControl = HplSensirionSht11P;
+  
+  components new TimerMilliC();
+  components HplPXA27xGPIOC;
+  HplSensirionSht11P.Timer -> TimerMilliC;
+  HplSensirionSht11P.DATA -> HplPXA27xGPIOC.HplPXA27xGPIOPin[GPIO_SHT11_DATA];
+  HplSensirionSht11P.SCK -> HplPXA27xGPIOC.HplPXA27xGPIOPin[GPIO_SHT11_CLK];
+  
+  components new SimpleFcfsArbiterC( "Sht11.Resource" ) as Arbiter;
   Resource = Arbiter;
 }