Diff: include/temperatureSensor.h

Revision:

5:0b3569945178

Parent:

4:ffc39af07ade

Child:

7:596c792ff02d

--- a/include/temperatureSensor.h	Thu Nov 22 15:57:35 2012 +0000
+++ b/include/temperatureSensor.h	Sat Nov 24 13:36:58 2012 +0000
@@ -1,50 +1,54 @@
-/*-------------------------------------------------------------------------*/
-/*                 TemperatureSensor header class declaration              */
-/*-------------------------------------------------------------------------*/
-/*                    Ni-MH charger project US191 IRD                      */
-/*-------------------------------------------------------------------------*/
-/*                       Nov 2012 | J Grelet                               */
-/*-------------------------------------------------------------------------*/
-
-#ifndef temperatureSensor_H
-#define temperatureSensor_H
-
-#include <iostream>
-#include "mbed.h"       // include mbed library  
-#include "statis.h"
-#include "nimh.h"
-
-class temperatureSensor {
-
-private:
-    Ticker      _ticker;    
-    AnalogIn    _pin;
-    Statis_data _filter;
-    float       _scaleTemp;
-    float       _scaleFactor;
-    float       _temperature;
- 
-    
-public:
-     // Constructor
-    temperatureSensor(PinName pin, float delay, float scale, MODE mode, size_t size);  
-    
-    // Destructor
-    virtual ~temperatureSensor();              
-    
-    // method that give the temperature measure of the sensor
-    float read(void); 
-
-    // A shorthand for read()
-    operator float() {
-        return read();
-    }
-    
-private:
-   // method that convert voltage measure in temperature
-    void toDo(void);
-
-};
-
-#endif // temperatureSensor_H
-
+/*-------------------------------------------------------------------------*/
+/*                 TemperatureSensor header class declaration              */
+/*-------------------------------------------------------------------------*/
+/*                    Ni-MH charger project US191 IRD                      */
+/*-------------------------------------------------------------------------*/
+/*                       Nov 2012 | J Grelet                               */
+/*-------------------------------------------------------------------------*/
+
+#ifndef temperatureSensor_H
+#define temperatureSensor_H
+
+#include <iostream>
+#include "mbed.h"       // include mbed library  
+#include "statis.h"
+
+
+class temperatureSensor
+{
+private:
+    Ticker      _ticker;
+    AnalogIn    _pin;
+    Statis_data _filter;
+    float       _scaleTemp;
+    float       _scaleFactor;
+    float       _temperature;
+
+
+public:
+    // Constructor
+    temperatureSensor(PinName pin, float delay, float scale, BITMSK calculs, size_t size);
+
+    // Destructor
+    virtual ~temperatureSensor();
+
+    // method that give the temperature measure of the sensor
+    void     calcule(void);
+    float    mediane(void);
+    float    moyenne(void);
+    int      indice(void);
+    float    ecart_type(void);
+    unsigned n_element(void);
+
+    // A shorthand for read()
+    //operator float() {
+    //    return read();
+    //}
+
+private:
+    // method that convert voltage measure in temperature
+    void toDo(void);
+};
+
+#endif // temperatureSensor_H
+