Changeset 15134

Timestamp:

03/22/13 17:10:03 (12 years ago)

Author:

tbretz

Message:

Connect and stop the FAD together with the other programs to get the corretc status for the feedback - if this gives trouble, we have to move it back and check for 'Disconnected' of the fadctrl before we can handle the Feedback states.

File:

• trunk/FACT++/scripts/Startup.js (modified) (4 diffs)

trunk/FACT++/scripts/Startup.js

@@ -79 +79 @@
 include("scripts/handleRatectrlConnected.js");
 include("scripts/handleLidClosed.js");
-
-checkSend(["BIAS_CONTROL","FTM_CONTROL", "FSC_CONTROL", "FEEDBACK", "RATE_CONTROL", "MCP"]);
+include("scripts/handleFadConnected.js");
+
+checkSend(["BIAS_CONTROL","FAD_CONTROL","FTM_CONTROL", "FSC_CONTROL", "FEEDBACK", "RATE_CONTROL", "MCP"]);
 
 dim.send("MCP/RESET");
@@ -90 +91 @@
 loop.add(handleFeedbackConnected); // Feedback needs FAD to be Connected
 loop.add(handleRatectrlConnected);
+loop.add(handleFadConnected);
 //loop.add(handleLidClosed);
 loop.run();
 
-console.out("Bias crate connected and voltage off.");
-console.out("Feedback switched off.");
-console.out("FTM connected and idle.");
-console.out("FSC connected.");
-console.out("Rate control connected.");
-//console.out("Lids closed.");
+console.out("biasctrl:    "+dim.state("BIAS_CONTROL").name);
+console.out("ftmctrl:     "+dim.state("FTM_CONTROL").name);
+console.out("fscctrl:     "+dim.state("FSC_CONTROL").name);
+console.out("feedback:    "+dim.state("FEEDBACK").name);
+console.out("ratecontrol: "+dim.state("RATE_CONTROL").name);
+console.out("fadctrl:     "+dim.state("FAD_CONTROL").name);
+console.out("mcp:         "+dim.state("MCP").name);
 console.out("");
 
@@ -128 +131 @@
 // Now we can safely try to connect the FAD boards.
 // -----------------------------------------------------------------
+/*
+ include("scripts/handleFadConnected.js");
 
 // If FADs already connected
-include("scripts/handleFadConnected.js");
 
 checkSend(["FAD_CONTROL"]);
@@ -150 +154 @@
 console.out(dim.state("FAD_CONTROL").name);
 console.out(dim.state("MCP").name);
+*/
 
 // ================================================================