Item Refactor complete
This commit is contained in:
parent
219fbfb4c7
commit
24c168cf64
17 changed files with 78 additions and 41 deletions
|
|
@ -28,11 +28,11 @@ void Regulator::sensorEvent(Sensor sensor)
|
|||
timer.start(timeout_*1000);
|
||||
if( sensor.field < setPoint_-band_ && (sensor.field < sensor_.field || sensor_.field > setPoint_-band_ || first) )
|
||||
{
|
||||
sigValue(triggerValue);
|
||||
performValueAction(triggerValue);
|
||||
}
|
||||
else if( sensor.field > setPoint_+band_ && (sensor.field > sensor_.field || sensor_.field < setPoint_+band_ || first) )
|
||||
{
|
||||
sigValue(!triggerValue);
|
||||
performValueAction(!triggerValue);
|
||||
}
|
||||
first = false;
|
||||
sensor_ = sensor;
|
||||
|
|
@ -42,15 +42,14 @@ void Regulator::sensorEvent(Sensor sensor)
|
|||
void Regulator::makeInactive()
|
||||
{
|
||||
first = true;
|
||||
if(active)
|
||||
sigValue(!triggerValue);
|
||||
performValueAction(!triggerValue);
|
||||
timer.stop();
|
||||
Actor::makeInactive();
|
||||
}
|
||||
|
||||
void Regulator::timeout()
|
||||
{
|
||||
sigValue(safeValue_);
|
||||
performValueAction(safeValue_);
|
||||
}
|
||||
|
||||
void Regulator::setPoint(float setPoint)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue