Index: trunk/FACT++/scripts/Startup.js
===================================================================
--- trunk/FACT++/scripts/Startup.js	(revision 17324)
+++ trunk/FACT++/scripts/Startup.js	(revision 17349)
@@ -262,4 +262,25 @@
 
 // ================================================================
+// Setup GPS control and wait for the satellites to be locked
+// ================================================================
+
+checkSend(["GPS_CONTROL"]);
+
+if (dim.state("GPS_CONTROL").name=="Disconnected")
+    dim.send("GPS_CONTROL/RECONNECT");
+
+// Wait for being connectes
+v8.timeout(5000, function() { if (dim.state("GPS_CONTROL").name!="Disconnected") return true; });
+
+// Wait for status available
+v8.timeout(5000, function() { if (dim.state("GPS_CONTROL").name!="Connected") return true; });
+
+if (dim.state("GPS_CONTROL").name=="Disabled")
+    dim.send("GPS_CONTROL/ENABLE");
+
+// Wait for gps to be enabled and locked
+dim.wait("GPS_CONTROL", "Locked", 15000);
+
+// ================================================================
 // Crosscheck all states
 // ================================================================
@@ -289,4 +310,5 @@
  [ "FTM_CONTROL",     [ "Valid", "TriggerOn"              ] ],
  [ "FAD_CONTROL",     [ "Connected", "WritingData"        ] ],
+ [ "GPS_CONTROL",     [ "Locked" ] ],
 ];