Diff: temperatureSensor.cpp

Revision:

3:0e06300940cd

Parent:

2:9517837c642d

Child:

4:ffc39af07ade

diff -r 9517837c642d -r 0e06300940cd temperatureSensor.cpp
--- a/temperatureSensor.cpp	Tue Nov 20 15:13:50 2012 +0000
+++ b/temperatureSensor.cpp	Thu Nov 22 14:47:20 2012 +0000
@@ -11,9 +11,9 @@
  
 // constructor
 // _pin(pin) means pass pin to the AnalogIn constructor
-temperatureSensor::temperatureSensor(PinName pin, float delay, float convertion, MODE mode, size_t size) : _pin(pin), _filter(mode, size) { 
+temperatureSensor::temperatureSensor(PinName pin, float delay, float scaleTemp, MODE mode, size_t size) : _pin(pin), _filter(mode, size) { 
   
-  _convertion  = convertion;
+  _scaleTemp  = scaleTemp;
   _scaleFactor = 100;
    
   // Attach a function to be called by the Ticker, specifiying the interval delay in seconds. 
@@ -28,12 +28,13 @@
 // remove 3.3
 // read AnalogIn voltage and convert into temperature
 void temperatureSensor::toDo(void) {
-  _temperature = (_pin * _scaleFactor * 3.3 ) - _convertion;
-  _filter.put( _temperature );
+  _temperature = (_pin * 3.3 * _scaleFactor) - _scaleTemp;
+  _filter.write( _temperature );
 }
 
 // return temperature measurement
 // add filtering with media and ring buffer
 float temperatureSensor::read(void) {
+  //return _filter.statis();
   return _filter.read();
 }
\ No newline at end of file