merge phmetre

OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorManometre.cpp

@@ -5,13 +5,13 @@
 #include "../../../include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h"
 
 AnalogSensorManometre::AnalogSensorManometre(float val, int temps):AnalogSensor(val,temps){ alea = 1;}
-
 void AnalogSensorManometre::run(){
 	int cpt = 0;
     while(1){
         if(ptrmem!=NULL){
 			if(cpt == 5){
             	*ptrmem = val - alea;
+            	val = val - alea;
                 cpt = 0;
 			}
         }

OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.cpp

@@ -3,3 +3,18 @@
 //
 
 #include "../../../include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h"
+
+AnalogSensorPHmetre::AnalogSensorPHmetre(float val, int temps) : AnalogSensor(val, temps) {}
+int AnalogSensorPHmetre::alea = 1;
+void AnalogSensorPHmetre::run() {
+    int cpt = 0;
+    while (ptrmem!=NULL){
+        if (cpt == 3){
+            *ptrmem = val - alea;
+            val = val - alea;
+            cpt = 0;
+        }
+        sleep(temps);
+        cpt ++;
+    }
+}

core_simulation.h

@@ -13,8 +13,8 @@
 #define MAX_I2C_DEVICES 4
 #define I2C_BUFFER_SIZE 1024
 #define MAX_IO_PIN 6
-#define THRESHOLDHIGH 17
-#define THRESHOLDLOW 15
+#define THRESHOLDHIGH 25
+#define THRESHOLDLOW 20
 
 using namespace std;
 

include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h

@@ -4,11 +4,11 @@
 
 #ifndef PROJET_VICTORAVECUNK_ANALOGSENSORMANOMETRE_H
 #define PROJET_VICTORAVECUNK_ANALOGSENSORMANOMETRE_H
-#include <iostream>
-#include <thread>
-#include <unistd.h>
-#include <string.h>
-#include <fstream>
+//#include <iostream>
+//#include <thread>
+//#include <unistd.h>
+//#include <string.h>
+//#include <fstream>
 #include "../AnalogDevice.h"
 
 class AnalogSensorManometre : public AnalogSensor{

include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h

@@ -5,9 +5,14 @@
 #ifndef PROJET_VICTORAVECUNK_ANALOGSENSORPHMETRE_H
 #define PROJET_VICTORAVECUNK_ANALOGSENSORPHMETRE_H
 
+#include "../AnalogDevice.h"
 
-class AnalogSensorPHmetre {
+class AnalogSensorPHmetre : public AnalogSensor {
+public:
+    static int alea;
 
+    AnalogSensorPHmetre(float val, int temps);
+    virtual void run();
 };