Index: /trunk/FACT++/scripts/CheckFTU.js
===================================================================
--- /trunk/FACT++/scripts/CheckFTU.js	(revision 15051)
+++ /trunk/FACT++/scripts/CheckFTU.js	(revision 15052)
@@ -3,11 +3,6 @@
 var service_ftm = new Subscription("FTM_CONTROL/FTU_LIST");
 
-// Make sure that we receive a 'Yes, we are connected' event
+// Make sure that we receive a 'Yes, we are connected and names are available' event
 service_ftm.get(5000);
-
-// Wait for the format string to be available
-// FIXME: Timeout
-while (!dim.send("FTM_CONTROL"))
-    v8.sleep();
 
 // Check for all FTUs to be connected when the next event arrives
@@ -36,5 +31,5 @@
 
 // Wait for 1 second for the answer
-var timeout = new Thread(1000, function(){ if (service_ftm.isOpen) throw new Error(""); });
+var timeout = new Thread(3000, function(){ if (service_ftm.isOpen) throw new Error("Could not check that all FTUs are ok within 3s."); });
 while (service_ftm.isOpen)
     v8.sleep();