Changeset 18388 for trunk/FACT++

Timestamp:

12/14/15 15:48:32 (9 years ago)

Author:

tbretz

Message:

Another try to solve the problems with the emergency parking. Note that it is only tried if possible during sun-rise and never again.

File:

• trunk/FACT++/src/drivectrl.cc (modified) (2 diffs)

trunk/FACT++/src/drivectrl.cc

@@ -2174 +2174 @@
     {
         const int rc = CheckState();
-        return rc>0 ? rc : T::GetCurrentState();
+        return rc>0 ? rc : State::kInitialized;
     }
 
@@ -2516 +2516 @@
         if (now>fSunRise && T::GetCurrentState()!=State::kParking)
         {
-            if (T::GetCurrentState()>State::kLocked && T::GetCurrentState()!=StateMachineImp::kError)
+            fSunRise = now.GetNextSunRise();
+
+            ostringstream msg;
+            msg << "Next sun-rise will be at " << fSunRise;
+            T::Info(msg);
+
+            if (T::GetCurrentState()>State::kArmed && T::GetCurrentState()!=StateMachineImp::kError)
                 return Park();
-
-            if (T::GetCurrentState()==State::kLocked)
-            {
-                fSunRise = now.GetNextSunRise();
-
-                ostringstream msg;
-                msg << "Next sun-rise will be at " << fSunRise;
-                T::Info(msg);
-
-                return State::kLocked;
-            }
         }