Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / tmirws / chips / sht11 / HplSensirionSht11P.nc

diff --git a/tos/platforms/tmirws/chips/sht11/HplSensirionSht11P.nc b/tos/platforms/tmirws/chips/sht11/HplSensirionSht11P.nc
index 45b30ec90d84f9c2335637f9cf8440f1b6d048e4..47b7569e8b5aec0b798a012546baa3c7752f0509 100644 (file)
--- a/tos/platforms/tmirws/chips/sht11/HplSensirionSht11P.nc
+++ b/tos/platforms/tmirws/chips/sht11/HplSensirionSht11P.nc
@@ -55,23 +55,16 @@ implementation {
     call Timer.startOneShot( 11 );
     return SUCCESS;
   }
-  
+
   event void Timer.fired() {
     signal SplitControl.startDone( SUCCESS );
   }
 
   command error_t SplitControl.stop() {
-#if 0
-    call SCK.makeInput();
+    call SCK.makeOutput();
     call SCK.clr();
     call DATA.makeInput();
-    call DATA.clr();
-#else
-    call DATA.makeOutput();
-    call SCK.clr();    /* remains an output so no floating pin */
-    call DATA.makeOutput();
-    call DATA.set();   /* set as pulled-up output so we see no interrupts */
-#endif
+    call DATA.set();
     call PWR.clr();
     post stopTask();
     return SUCCESS;