[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/max136x HalMAX136xControlP.nc, 1.1.2.3, 1.1.2.4 HplMAX136xLogicP.nc, 1.1.2.4, 1.1.2.5

[Philip Buonadonna]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/max136x
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19022

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HalMAX136xControlP.nc HplMAX136xLogicP.nc 
Log Message:


Index: HalMAX136xControlP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/max136x/HalMAX136xControlP.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
*** HalMAX136xControlP.nc	7 Nov 2006 23:15:03 -0000	1.1.2.3
--- HalMAX136xControlP.nc	14 Nov 2006 03:29:43 -0000	1.1.2.4
***************
*** 120,127 ****
      state = S_SETSCANMODE;
  
!     configByteShadow &= ~MAX136X_CONFIG_SCAN(3);
!     configByteShadow |= MAX136X_CONFIG_SCAN(mode);
! 
!     configByteShadow &= ~MAX136X_CONFIG_CS(3);
      configByteShadow |= MAX136X_CONFIG_CS(chanhigh);
  
--- 120,125 ----
      state = S_SETSCANMODE;
  
!     configByteShadow &= ~(MAX136X_CONFIG_SCAN(0x3) | MAX136X_CONFIG_CS(0xF));
!     configByteShadow |= MAX136X_CONFIG_SCAN(0x0);
      configByteShadow |= MAX136X_CONFIG_CS(chanhigh);
  
***************
*** 143,147 ****
      state = S_SETMONMODE;
  
!     configByteShadow &= ~MAX136X_CONFIG_CS(3);
      configByteShadow |= MAX136X_CONFIG_CS(chanhigh);
  
--- 141,146 ----
      state = S_SETMONMODE;
  
!     configByteShadow &= ~(MAX136X_CONFIG_SCAN(0x3) | MAX136X_CONFIG_CS(0xF));
!     configByteShadow |= MAX136X_CONFIG_SCAN(0x2);
      configByteShadow |= MAX136X_CONFIG_CS(chanhigh);
  
***************
*** 237,241 ****
  
    command error_t HalMAX136xAdvanced.enableAlert(bool bEnable) {
-     uint8_t i;
      error_t status;
      if(state != S_IDLE)
--- 236,239 ----
***************
*** 251,256 ****
        monitorByteShadow &= ~MAX136X_MONITOR_INTEN;
  
!     mI2CBuffer[1] = setupByteShadow;
!     mI2CBuffer[2] = monitorByteShadow;
      
      call HplMAX136x.setConfig(mI2CBuffer, 2);
--- 249,254 ----
        monitorByteShadow &= ~MAX136X_MONITOR_INTEN;
  
!     mI2CBuffer[0] = setupByteShadow;
!     mI2CBuffer[1] = (0xF0 | monitorByteShadow);
      
      call HplMAX136x.setConfig(mI2CBuffer, 2);

Index: HplMAX136xLogicP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/max136x/HplMAX136xLogicP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** HplMAX136xLogicP.nc	7 Nov 2006 23:15:03 -0000	1.1.2.4
--- HplMAX136xLogicP.nc	14 Nov 2006 03:29:43 -0000	1.1.2.5
***************
*** 49,52 ****
--- 49,53 ----
    uses interface I2CPacket<TI2CBasicAddr>;
    uses interface GpioInterrupt as InterruptAlert;
+   uses interface GeneralIO as InterruptPin;
  }
  
***************
*** 125,128 ****
--- 126,131 ----
  
    command error_t Init.init() {
+     call InterruptPin.makeInput();
+     call InterruptAlert.enableFallingEdge();
      atomic {
        mStopRequested = FALSE;
***************
*** 178,182 ****
  
    async event void I2CPacket.readDone(error_t i2c_error, uint16_t chipAddr, uint8_t len, uint8_t *buf) {
-     uint16_t tempVal;
      error_t error = i2c_error;
  
--- 181,184 ----