You need to initialize the valve states and timer etc., as similar to when you jump from idle state to fill water state. Fill water state just checks the pressure check condition.
Does default mean invalid state (s/w fault) or does it mean it's a state that we don't need to do anything for? If latter, add a comment here saying that.