[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tmp175 HalTMP175ControlP.nc, 1.1.2.3, 1.1.2.4

Philip Buonadonna philipb at users.sourceforge.net
Fri Nov 3 14:27:24 PST 2006


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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HalTMP175ControlP.nc 
Log Message:
- Fixed bug in setting threshold register values that interfered with
  control register


Index: HalTMP175ControlP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tmp175/HalTMP175ControlP.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
*** HalTMP175ControlP.nc	17 Jul 2006 17:10:27 -0000	1.1.2.3
--- HalTMP175ControlP.nc	3 Nov 2006 22:27:21 -0000	1.1.2.4
***************
*** 66,70 ****
    task void complete_Alert() {
      signal HalTMP175Advanced.alertThreshold();
-     call HplTMP175.measureTemperature();
    }
  
--- 66,69 ----
***************
*** 72,76 ****
      error_t error;
  
- 
      mState = nextState;
  
--- 71,74 ----
***************
*** 85,89 ****
  
      return error;
- 
    }
  
--- 83,86 ----
***************
*** 91,95 ****
      error_t error;
  
- 
      mState = nextState;
  
--- 88,91 ----
***************
*** 102,111 ****
        call TMP175Resource.release();
      }
-     else {
-       mConfigRegVal = val;
-     }
  
      return error;
- 
    }
  
--- 98,103 ----
***************
*** 188,193 ****
        return error;
      }
!     
!     //error = call HplTMP175.setTLowReg(val << 4);
      error = setThresh(STATE_SET_TLOW, val);
  
--- 180,184 ----
        return error;
      }
! 
      error = setThresh(STATE_SET_TLOW, val);
  
***************
*** 207,211 ****
      }
  
-     //error = call HplTMP175.setTHighReg(val << 4);
      error = setThresh(STATE_SET_THIGH, val);
  
--- 198,201 ----



More information about the Tinyos-2-commits mailing list