Changeset 16787 for trunk/FACT++/scripts

Timestamp:

06/10/13 11:57:12 (11 years ago)

Author:

tbretz

Message:

Improved the output whenever a command is sent.

Location:

trunk/FACT++/scripts

Files:

• handleAgilentPowerOn.js (modified) (2 diffs)
• handleFeedbackConnected.js (modified) (1 diff)
• handleFscConnected.js (modified) (1 diff)
• handleFtmIdle.js (modified) (1 diff)
• handleLidClosed.js (modified) (1 diff)
• handlePwrCameraOn.js (modified) (2 diffs)
• handleRatectrlConnected.js (modified) (1 diff)

trunk/FACT++/scripts/handleAgilentPowerOn.js

@@ -21 +21 @@
 
     case "VoltageOff":
-        console.out("Agilent in VoltageOff... switching agilent output on.");
+        console.out("Agilent in 'VoltageOff'... sending SET_POWER ON... waiting for 'VoltageOn'.");
         dim.send("AGILENT_CONTROL/SET_POWER", true);
         return "VoltageOn";
@@ -29 +29 @@
 
     case "VoltageHigh":
-        throw new Error("Agilent reports voltage above limit... please check.");
+        throw new Error("Agilent reports voltage above limit ('VoltageHigh')... please check.");
     }
 

trunk/FACT++/scripts/handleFeedbackConnected.js

@@ -28 +28 @@
     case "CurrentControl":
     case "Calibrating":
-        console.out("Feedback in "+state.name+"... stop feedback.");
+        console.out("Feedback in '"+state.name+"'... sending STOP... waiting for 'Connected'.");
         dim.send("FEEDBACK/STOP");
         return "Connected";

trunk/FACT++/scripts/handleFscConnected.js

@@ -15 +15 @@
     // Do-nothing conditions
     case "Disconnected":
-        console.out("Fsc in Diconnected... connect.");
+        console.out("Fscctrl in 'Diconnected'... sending RECONNECT... waiting for 'Connected'.");
         dim.send("FSC_CONTROL/RECONNECT");
         return "Connected";

trunk/FACT++/scripts/handleFtmIdle.js

@@ -15 +15 @@
     {
     case "Disconnected":
-        console.out("Ftm in "+state.name+"... connect.");
+        console.out("Ftmctrl in 'Disconnected'... sending RECONNECT... wainting for 'Idle'.");
         dim.send("FTM_CONTROL/RECONNECT");
-        return "Idle";
+        return "Valid";
 
     case "Idle":
-        //ftu_counter = data.counter;
+        console.out("Ftmctrl in 'Idle'... sending DISCONNECT... wainting for 'Disconnected'.");
+        dim.send("FTM_CONTROL/DISCONNECT");
+        v8.sleep(3000);
+        return "Disconnected";
+
+    case "Valid":
         return "";
 
     case "TriggerOn":
-        console.out("Ftm in "+state.name+"... stop trigger.");
+        console.out("Ftmctrl in 'TriggerOn'... sending STOP_TRIGGER... waiting for 'Idle'.");
         dim.send("FTM_CONTROL/STOP_TRIGGER");
-        return "Idle";
+        return "Valid";
  
     case "Configuring1":
     case "Configuring2":
     case "Configured":
-        console.out("Ftm in "+state.name+"... reset configuration.");
+        console.out("Ftmctrl in '"+state.name+"'... sending RESET_CONFIGURE... waiting for 'Idle'.");
         dim.send("FTM_CONTROL/RESET_CONFIGURE");
-        return "Idle";
+        return "Valid";
 
     case "ConfigError1":

trunk/FACT++/scripts/handleLidClosed.js

@@ -22 +22 @@
     case "Inconsistent":
     case "Open":
-        console.out("Lid in "+state.name+"... closing lids.");
+        console.out("Lidctrl in '"+state.name+"'... sending CLOSE... waiting for 'Closed'.");
         dim.send("LID_CONTROL/CLOSE");
         return "Closed";

trunk/FACT++/scripts/handlePwrCameraOn.js

@@ -21 +21 @@
     // Drive off
     case "PowerOff":
-        console.out("Pwr in PowerOff... switching camera power on.");
+        console.out("Pwrctrl in 'PowerOff'... sending CAMERA_POWER ON... waiting for 'DriveOff'.");
         dim.send("PWR_CONTROL/CAMERA_POWER", true);
         return "DriveOff";
@@ -27 +27 @@
     // Drive on
     case "DriveOn":
-        console.out("Pwr in DriveOn... switching camera power on.");
+        console.out("Pwrctrl in 'DriveOn'... sending CAMERA_POWER ON... waiting for 'SystemOn'.");
         dim.send("PWR_CONTROL/CAMERA_POWER", true);
         return "SystemOn";

trunk/FACT++/scripts/handleRatectrlConnected.js

@@ -19 +19 @@
     case "GlobalThresholdSet":
     case "InProgress":
-        console.out("Ratectrl in "+state.name+"... stop.");
+        console.out("Ratectrl in '"+state.name+"'... sending STOP... waiting for 'Connected'.");
         dim.send("RATE_CONTROL/STOP");
         return "Connected";