bray/Projet_VictorAvecUnK
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'modifRad'

Browse source
This commit is contained in:
Cameron Bray 2020-05-18 14:05:48 +02:00
commit b23f800eff
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
OtherDevices/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.cpp
View file

@ -4,8 +4,8 @@
#include "../../../include/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.h"
DigitalActuatorRadiator::DigitalActuatorRadiator(int temps, float threshold) : DigitalActuator(temps),
threshold(threshold) {}
DigitalActuatorRadiator::DigitalActuatorRadiator(int temps, float thresholdHigh, float thresholdLow) : DigitalActuator(temps),
thresholdHigh(thresholdHigh), thresholdLow(thresholdLow) {}
void DigitalActuatorRadiator::activate() {
DigitalDevice::state = HIGH;
@ -23,10 +23,18 @@ void DigitalActuatorRadiator::Run() {
}
}
float DigitalActuatorRadiator::getThreshold() const {
return threshold;
float DigitalActuatorRadiator::getThresholdLow() const {
return thresholdLow;
}
void DigitalActuatorRadiator::setThreshold(float threshold) {
DigitalActuatorRadiator::threshold = threshold;
void DigitalActuatorRadiator::setThresholdLow(float thresholdLow) {
DigitalActuatorRadiator::thresholdLow = thresholdLow;
}
float DigitalActuatorRadiator::getThresholdHigh() const {
return thresholdHigh;
}
void DigitalActuatorRadiator::setThresholdHigh(float threshold) {
DigitalActuatorRadiator::thresholdHigh = threshold;
}

16
include/DigitalDevices/DigitalActuators/DigitalActuatorRadiator.h
View file

@ -11,12 +11,18 @@
class DigitalActuatorRadiator : public DigitalActuator {
private:
float threshold;
public:
DigitalActuatorRadiator(int temps, float threshold);
float thresholdHigh, thresholdLow;
public:
DigitalActuatorRadiator(int temps, float threshold, float thresholdLow);
float getThresholdHigh() const;
void setThresholdHigh(float threshold);
float getThresholdLow() const;
void setThresholdLow(float thresholdLow);
float getThreshold() const;
void setThreshold(float threshold);
void activate();
void Run();
};