state-handler: add sttaeGetPressure functionality
This commit is contained in:
parent
905fbd3634
commit
54b09fc46d
@ -119,7 +119,7 @@ StateHandler::stateManual (const Event &event)
|
|||||||
this->A01->write (value[MANUAL].getCurrent () * 10);
|
this->A01->write (value[MANUAL].getCurrent () * 10);
|
||||||
break;
|
break;
|
||||||
case Event::eTick:
|
case Event::eTick:
|
||||||
save (event.value, MANUAL);
|
SetState (&StateHandler::stateGetPressure);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -139,12 +139,7 @@ StateHandler::stateAuto (const Event &event)
|
|||||||
handleControlButtons (event.value);
|
handleControlButtons (event.value);
|
||||||
break;
|
break;
|
||||||
case Event::eTick:
|
case Event::eTick:
|
||||||
save (event.value, AUTO);
|
SetState (&StateHandler::stateGetPressure);
|
||||||
#if PID
|
|
||||||
pid ();
|
|
||||||
this->A01->write (fan_speed.getCurrent ());
|
|
||||||
#endif
|
|
||||||
#if !PID
|
|
||||||
if (saved_curr_value[AUTO] < saved_set_value[AUTO])
|
if (saved_curr_value[AUTO] < saved_set_value[AUTO])
|
||||||
{
|
{
|
||||||
fan_speed.inc ();
|
fan_speed.inc ();
|
||||||
@ -155,7 +150,6 @@ StateHandler::stateAuto (const Event &event)
|
|||||||
fan_speed.dec ();
|
fan_speed.dec ();
|
||||||
this->A01->write (fan_speed.getCurrent ());
|
this->A01->write (fan_speed.getCurrent ());
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -210,14 +204,14 @@ StateHandler::stateGetPressure (const Event &event)
|
|||||||
handleControlButtons (event.value);
|
handleControlButtons (event.value);
|
||||||
break;
|
break;
|
||||||
case Event::eTick:
|
case Event::eTick:
|
||||||
if (pressure_status)
|
if (!pressure_status)
|
||||||
{
|
|
||||||
save (pressure->getPressure (), ((current_mode) ? AUTO : MANUAL));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
pressure->wakeUp ();
|
pressure->wakeUp ();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
save (pressure->getPressure (), ((current_mode) ? AUTO : MANUAL));
|
||||||
|
SetState (current_mode ? &StateHandler::stateAuto
|
||||||
|
: &StateHandler::stateManual);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user