Index: /trunk/FACT++/src/drivectrl.cc
===================================================================
--- /trunk/FACT++/src/drivectrl.cc	(revision 15099)
+++ /trunk/FACT++/src/drivectrl.cc	(revision 15100)
@@ -790,4 +790,12 @@
     }
 
+    int Park()
+    {
+        SendCommand("PREPS Park", false);
+
+        // FIXME: Go to locked state only when park position properly reached
+        return Drive::State::kLocked;
+    }
+
     int Resume()
     {
@@ -1183,8 +1191,5 @@
         {
             if (Time()>fSunRise)
-            {
-                SendCommand("PREPS Park", false);
-                return Drive::State::kLocked;
-            }
+                return Park();
         }
 
@@ -1328,5 +1333,5 @@
 
         T::AddEvent("PARK", State::kArmed, State::kMoving, State::kTracking, State::kOnTrack, 0x100)
-            (bind(&StateMachineDrive::SendCommand, this, "PREPS Park", false))
+            (bind(&StateMachineDrive::Park, this))
             ("Park the telescope");