[Tinyos-2-commits] CVS: tinyos-2.x/tos/sensorboards/im2sb SensirionSht11C.nc, 1.1.2.3, 1.1.2.4 HplSensirionSht11C.nc, 1.1.2.3, 1.1.2.4 HplSensirionSht11P.nc, 1.1.2.2, 1.1.2.3 HalSensirionSht11C.nc, 1.1.2.3, 1.1.2.4

[Philip Buonadonna]

Update of /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17510

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	SensirionSht11C.nc HplSensirionSht11C.nc HplSensirionSht11P.nc 
	HalSensirionSht11C.nc 
Log Message:
Added SplitControl interface

Index: SensirionSht11C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/SensirionSht11C.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** SensirionSht11C.nc	7 Nov 2006 23:15:26 -0000	1.1.2.3
--- SensirionSht11C.nc	14 Nov 2006 00:53:35 -0000	1.1.2.4
***************
*** 45,51 ****
  
  generic configuration SensirionSht11C() {
    provides interface Read<uint16_t> as Temperature;
    provides interface Read<uint16_t> as Humidity;
!   //provides interface HalSht11Advanced;
  }
  implementation {
--- 45,52 ----
  
  generic configuration SensirionSht11C() {
+   provides interface SplitControl;
    provides interface Read<uint16_t> as Temperature;
    provides interface Read<uint16_t> as Humidity;
!   provides interface HalSht11Advanced;
  }
  implementation {
***************
*** 60,63 ****
--- 61,65 ----
    enum { HUM_KEY = unique("Sht11.Resource") };
  
+   SplitControl = HalSensirionSht11C;
    SensirionSht11ReaderP.TempResource -> HalSensirionSht11C.Resource[ TEMP_KEY ];
    SensirionSht11ReaderP.Sht11Temp -> HalSensirionSht11C.SensirionSht11[ TEMP_KEY ];
***************
*** 65,72 ****
    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 ];
  }
--- 67,74 ----
    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 ];
  }

Index: HplSensirionSht11C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/HplSensirionSht11C.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** HplSensirionSht11C.nc	7 Nov 2006 23:15:25 -0000	1.1.2.3
--- HplSensirionSht11C.nc	14 Nov 2006 00:53:35 -0000	1.1.2.4
***************
*** 44,47 ****
--- 44,48 ----
  
  configuration HplSensirionSht11C {
+   provides interface SplitControl;
    provides interface Resource[ uint8_t id ];
    provides interface GeneralIO as DATA;
***************
*** 56,59 ****
--- 57,69 ----
    InterruptDATA = GeneralIOC.GpioInterrupt[GPIO_SHT11_DATA];
  
+   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;

Index: HplSensirionSht11P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/HplSensirionSht11P.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** HplSensirionSht11P.nc	7 Nov 2006 23:15:25 -0000	1.1.2.2
--- HplSensirionSht11P.nc	14 Nov 2006 00:53:35 -0000	1.1.2.3
***************
*** 43,48 ****
    provides interface SplitControl;
    uses interface Timer<TMilli>;
!   uses interface HPlPXA27xGPIOPin as DATA;
!   uses interface HPLPXA27xGPIOPin as SCK;
  }
  implementation {
--- 43,48 ----
    provides interface SplitControl;
    uses interface Timer<TMilli>;
!   uses interface HplPXA27xGPIOPin as DATA;
!   uses interface HplPXA27xGPIOPin as SCK;
  }
  implementation {
***************
*** 72,75 ****
--- 72,78 ----
      signal SplitControl.stopDone( SUCCESS );
    }
+ 
+   async event void DATA.interruptGPIOPin() { return; }
+   async event void SCK.interruptGPIOPin() { return; }
  }
  

Index: HalSensirionSht11C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/im2sb/HalSensirionSht11C.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** HalSensirionSht11C.nc	7 Nov 2006 23:15:25 -0000	1.1.2.3
--- HalSensirionSht11C.nc	14 Nov 2006 00:53:35 -0000	1.1.2.4
***************
*** 43,46 ****
--- 43,47 ----
  
  configuration HalSensirionSht11C {
+   provides interface SplitControl;
    provides interface Resource[ uint8_t client ];
    provides interface SensirionSht11[ uint8_t client ];
***************
*** 51,58 ****
--- 52,61 ----
  
    components HplSensirionSht11C;
+   SplitControl = HplSensirionSht11C;
    Resource = HplSensirionSht11C.Resource;
    SensirionSht11LogicP.DATA -> HplSensirionSht11C.DATA;
    SensirionSht11LogicP.CLOCK -> HplSensirionSht11C.SCK;
    SensirionSht11LogicP.InterruptDATA -> HplSensirionSht11C.InterruptDATA;
+ 
    
    components new TimerMilliC();