diff --git a/OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp b/OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp index 6915d69..d8d0309 100644 --- a/OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp +++ b/OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp @@ -22,3 +22,11 @@ void DigitalActuatorRadiator::Run() { } } } + +float DigitalActuatorRadiator::getThreshold() const { + return threshold; +} + +void DigitalActuatorRadiator::setThreshold(float threshold) { + DigitalActuatorRadiator::threshold = threshold; +} diff --git a/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h b/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h index 491c7ce..cd21ff2 100644 --- a/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h +++ b/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h @@ -15,15 +15,13 @@ // exemple de capteur analogique de temperature, ne pas oublier d'heriter de Device class AnalogSensorTemperature: public AnalogDevice { +private: + static int alea; public: // fait osciller la valeur du cpateur de 1 - static int alea; //TODO modifier dans diagramme de classe - //constructeur ne pas oublier d'initialiser la classe mere AnalogSensorTemperature(int d,int t); - - static void setAlea(int alea); //TODO mettre dans diagramme de classe - + static void setAlea(int alea); // thread representant le capteur et permettant de fonctionner independamment de la board virtual void run(); }; diff --git a/include/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.h b/include/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.h index 3892f96..7440564 100644 --- a/include/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.h +++ b/include/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.h @@ -14,6 +14,9 @@ private: float threshold; public: DigitalActuatorRadiator(int temps, float threshold); + + float getThreshold() const; + void setThreshold(float threshold); void activate(); void Run(); };