From 9527f1004b0d1f191544e4d65ddad7835f7e62ac Mon Sep 17 00:00:00 2001
From: victorleroch <leroch@etud.insa-toulouse.fr>
Date: Wed, 20 May 2020 10:57:02 +0200
Subject: [PATCH] =?UTF-8?q?manometre=20declar=C3=A9,=20je=20pense=20ca=20m?=
 =?UTF-8?q?arche?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AnalogSensors/AnalogSensorManometre.cpp   | 24 +++++++++++--------
 .../AnalogSensors/AnalogSensorManometre.h     | 12 ++++++----
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorManometre.cpp b/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorManometre.cpp
index de20b4a..502968e 100644
--- a/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorManometre.cpp
+++ b/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorManometre.cpp
@@ -4,18 +4,22 @@
 
 #include "../../../include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h"
 
-AnalogSensorManometre::AnalogSensorManometre(float val, int temps):AnalogSensor(val,temps){ alea = 1;}
+int AnalogSensorManometre::alea = -1;
+
+AnalogSensorManometre::AnalogSensorManometre(int val, int temps):AnalogDevice(val,temps){
+    AnalogSensorManometre::alea=-1;
+}
+
 void AnalogSensorManometre::run(){
-	int cpt = 0;
     while(1){
-        if(ptrmem!=NULL){
-			if(cpt == 5){
-            	*ptrmem = val - alea;
-            	val = val - alea;
-                cpt = 0;
-			}
+        if(ptrmem!=NULL) {
+            *ptrmem = val + AnalogSensorManometre::alea;
+            val = val + AnalogSensorManometre::alea;
         }
-		sleep(temps);
-		cpt++;
+        sleep(temps);
     }
 }
+
+void AnalogSensorManometre::setAlea(int alea) {
+    AnalogSensorManometre::alea = alea;
+}
diff --git a/include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h b/include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h
index bbb2897..b01aab0 100644
--- a/include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h
+++ b/include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h
@@ -11,11 +11,15 @@
 //#include <fstream>
 #include "../AnalogDevice.h"
 
-class AnalogSensorManometre : public AnalogSensor{
-private:
-	int alea;
+class AnalogSensorManometre: public AnalogDevice {
 public:
-    AnalogSensorManometre(float val, int t); //
+    static int alea;
+public:
+    // fait osciller la valeur du cpateur de 1
+    //constructeur ne pas oublier d'initialiser la classe mere
+    AnalogSensorManometre(int d,int  t);
+    static void setAlea(int alea);
+    // thread representant le capteur et permettant de fonctionner independamment de la board
     virtual void run();
 };