Changeset 16570

Timestamp:

06/02/13 11:31:51 (12 years ago)

Author:

tbretz

Message:

We have to check for the MCP state, too, to make sure that the state got already propagated and reports so that our stateCheck will be happy

File:

• trunk/FACT++/scripts/takeRun.js (modified) (2 diffs)

trunk/FACT++/scripts/takeRun.js

@@ -87 +87 @@
 
     console.out("   ...waiting for 1s");
+
+    // Wait for one second to bridge possible pending connects
     v8.sleep(1000);
+
     console.out("   ...checking connection");
+
+    // Wait for FAD_CONTROL to realize that all boards are connected
+    // FIXME: Wait for '40' boards being connected instead
     dim.wait("FAD_CONTROL", "Connected", 3000);
+
+    // Wait also for MCP to have all boards connected again
+    dim.wait("MCP", "Idle", 3000);
     console.out("");
 }
@@ -217 +226 @@
         console.out(" - FTM_CONTROL: "+dim.state("FTM_CONTROL").name);
 
-        dim.wait("MCP",         "Idle", 3000);
-        dim.wait("FTM_CONTROL", "Idle", 3000);
-
-        // Necessary to allow the disconnect, reconnect
-        dim.send("FAD_CONTROL/CLOSE_OPEN_FILES");
+        dim.wait("FTM_CONTROL", "Idle",      3000);
         dim.wait("FAD_CONTROL", "Connected", 3000);
+        dim.wait("MCP",         "Idle",      3000);
 
         var list = [];