diff --git a/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorTemperature.cpp b/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorTemperature.cpp index 6e5f893..162e711 100644 --- a/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorTemperature.cpp +++ b/OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorTemperature.cpp @@ -5,15 +5,23 @@ #include "../../../include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h" //classe AnalogSensorTemperature + +int AnalogSensorTemperature::alea = -1; + AnalogSensorTemperature::AnalogSensorTemperature(int val,int temps):AnalogDevice(val,temps){ - alea=1; + AnalogSensorTemperature::alea=-1; } void AnalogSensorTemperature::run(){ while(1){ - alea=1-alea; - if(ptrmem!=NULL) - *ptrmem=val+alea; + if(ptrmem!=NULL) { + *ptrmem = val + AnalogSensorTemperature::alea; + val = val + AnalogSensorTemperature::alea; + } sleep(temps); } } + +void AnalogSensorTemperature::setAlea(int alea) { + AnalogSensorTemperature::alea = alea; +} diff --git a/OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp b/OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp index cdbc2af..098a43a 100644 --- a/OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp +++ b/OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp @@ -16,8 +16,10 @@ void DigitalActuatorRadiator::Run() { while (1){ state = *ptrmem; if ((state != previousState)||(state == HIGH)){ + //AnalogSensorTemperature::alea = 1; AnalogSensorTemperature::setAlea(1); } else if((state != previousState)||(state == LOW)) { + //AnalogSensorTemperature::alea = -1; AnalogSensorTemperature::setAlea(-1); } } diff --git a/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h b/include/AnalogDevices/AnalogSensors/AnalogSensorTemperature.h index cd21ff2..8d3ad46 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 { -private: +public: static int alea; public: // fait osciller la valeur du cpateur de 1