From a38774d31f0bef61892cb126811f0e3e84c3361b Mon Sep 17 00:00:00 2001 From: bray Date: Wed, 20 May 2020 11:55:18 +0200 Subject: [PATCH] Electrovanne terminee et fonctionelle 2.0 --- .../AnalogDevices/AnalogSensors/AnalogSensorPHmetre.cpp | 4 ++++ include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h | 2 +- include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h | 5 +++-- .../AnalogDevices/AnalogSensors/AnalogSensorTemperature.h | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.cpp b/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.cpp index 9fd9974..1cd89b9 100644 --- a/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.cpp +++ b/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.cpp @@ -18,3 +18,7 @@ void AnalogSensorPHmetre::run() { cpt ++; } } + +void AnalogSensorPHmetre::setAlea(int alea) { + AnalogSensorPHmetre::alea = alea; +} diff --git a/include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h b/include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h index b01aab0..70ea770 100644 --- a/include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h +++ b/include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h @@ -12,7 +12,7 @@ #include "../AnalogDevice.h" class AnalogSensorManometre: public AnalogDevice { -public: +private: static int alea; public: // fait osciller la valeur du cpateur de 1 diff --git a/include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h b/include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h index 7b819eb..376d6e4 100644 --- a/include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h +++ b/include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h @@ -8,9 +8,10 @@ #include "../AnalogDevice.h" class AnalogSensorPHmetre : public AnalogSensor { -public: +private: static int alea; - +public: + static void setAlea(int alea); AnalogSensorPHmetre(float val, int temps); virtual void run(); }; diff --git a/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h b/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h index 8d3ad46..cd21ff2 100644 --- a/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h +++ b/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h @@ -15,7 +15,7 @@ // exemple de capteur analogique de temperature, ne pas oublier d'heriter de Device class AnalogSensorTemperature: public AnalogDevice { -public: +private: static int alea; public: // fait osciller la valeur du cpateur de 1