Index: /trunk/FACT++/scripts/Main.js
===================================================================
--- /trunk/FACT++/scripts/Main.js	(revision 17537)
+++ /trunk/FACT++/scripts/Main.js	(revision 17538)
@@ -260,9 +260,9 @@
         // ramping and will reject the command to switch the
         // voltage off
-        dim.send("FEEDBACK/STOP");
-        dim.wait("FEEDBACK", "Calibrated", 3000);
+        //dim.send("FEEDBACK/STOP");
+        //dim.wait("FEEDBACK", "Calibrated", 3000);
 
         // Make sure we are not in Ramping anymore
-        dim.wait("BIAS_CONTROL", "VoltageOn", 3000);
+        //dim.wait("BIAS_CONTROL", "VoltageOn", 3000);
 
         // Switch voltage off
@@ -401,5 +401,10 @@
     }
 
-    v8.timeout(150000, func);
+    try { v8.timeout(150000, func); }
+    catch (e)
+    {
+        var p = sub.get();
+        dim.log('Park position not reached? Telescope at Zd='+p.obj['Zd']+' Az='+p.obj['Az']);
+    }
 
     /*
@@ -713,5 +718,5 @@
     }
 
-    console.log("IRQ "+irq+" unhandled... stopping script.");
+    dim.log("IRQ "+irq+" unhandled... stopping script.");
     return true;
 }
@@ -942,16 +947,18 @@
 
     case "OVTEST":
-        var park = Sun.horizon(-27).isUp;
-        if (park)
+        var locked = dim.state("DRIVE_CONTROL").name=="Locked";
+        if (!locked)
             dim.send("DRIVE_CONTROL/PARK");
+
         dim.send("FEEDBACK/STOP");
 
-        // The lid must be closes
+        // The lid must be closed
         CloseLid();
 
-        if (park)
-        {
-            console.out("Waiting for telescope to park. This may take a while.");
+        if (!locked)
+        {
+            //console.out("Waiting for telescope to park. This may take a while.");
             dim.wait("DRIVE_CONTROL", "Locked", 3000);
+            dim.send("DRIVE_CONTROL/UNLOCK");
         }