Compare commits

..

No commits in common. "b23f800effed8e8ac8ed5ae73636983d47051bd5" and "04d5350d30437f2ad704859d49414a8b586f3e41" have entirely different histories.

2 changed files with 10 additions and 24 deletions

View file

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

View file

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