Changeset 17031

Timestamp:

08/20/13 08:07:02 (11 years ago)

Author:

tbretz

Message:

Could not take single-pe runs when drive system was locked; FEEDBACK/REFERENCE removed; fixed the bugs in the new voltage on/off procedure

File:

• trunk/FACT++/scripts/Main.js (modified) (11 diffs)

trunk/FACT++/scripts/Main.js

@@ -196 +196 @@
 service_feedback.onchange = function(evt)
 {
-    if (this.cnt && evt.counter>this.cnt+12)
-        return;
-
     if (!evt.data)
         return;
@@ -204 +201 @@
     var Unom = evt.obj['U_nom'];
     var Uov  = evt.obj['U_ov'];
-    if (!U_ov)
+    if (!Uov)
         return;
 
@@ -221 +218 @@
     avg /= 320;
 
+    if (this.ok==undefined)
+        return;
+
     this.ok = cnt==0;
 
-    console.out("  DeltaUov=%.3f [N(>0.033V)=%d]".$(this.voltageStep, cnt));
+    console.out("  DeltaUov=%.3f [N(>0.033V)=%d]".$(avg, cnt));
 }
 
@@ -248 +248 @@
         dim.log("Switching voltage off.");
 
+        this.ok = undefined;
+
         // Supress the possibility that the bias control is
         // ramping and will reject the command to switch the
@@ -258 +260 @@
     }
 
-    dim.wait("BIAS_CONTROL", "VoltageOff", 5000);
+    dim.wait("BIAS_CONTROL", "VoltageOff", 60000);
 
     // FEEDBACK stays in CurrentCtrl when Voltage is off but output enabled
@@ -297 +299 @@
     {
         dim.log("Switching voltage on.");
+
         dim.send("FEEDBACK/START", 1.1);
         dim.wait("FEEDBACK", "InProgress", 45000);
@@ -302 +305 @@
 
     // Wait until voltage on
-    dim.wait("BIAS_CONTROL", "VoltageOn", 5000);
+    dim.wait("BIAS_CONTROL", "VoltageOn", 60000);
 
     if (isOff)
@@ -315 +318 @@
     function func()
     {
-        if (irq || this.ok)
+        if (irq || this.ok==true)
             return true;
     }
@@ -327 +330 @@
     else
         dim.log("Voltage stable within limits");
+
+    this.ok = undefined;
 }
 
@@ -445 +450 @@
          "FEEDBACK/CALIBRATION_R8",
          "FEEDBACK/CALIBRATION_STEPS",
-         "FEEDBACK/REFERENCE",
+/*         "FEEDBACK/REFERENCE",*/
          "FSC_CONTROL/CURRENT",
          "FSC_CONTROL/HUMIDITY",
@@ -739 +744 @@
     // It is not ideal that we allow the drive to be on during day time, but
     // otherwise it is difficult to allow e.g. the STARTUP at the beginning of the night
-    var power_states = sun.isUp || system_on===false ? [ "DriveOff", "SystemOn" ] : [ "SystemOn" ];
-    var drive_states = sun.isUp || system_on===false ?   undefined    : [ "Armed", "Tracking", "OnTrack" ];
+    var power_states = sun.isUp || !system_on ? [ "DriveOff", "SystemOn" ] : [ "SystemOn" ];
+    var drive_states = sun.isUp || !system_on ?   undefined    : [ "Armed", "Tracking", "OnTrack" ];
 
     // A scheduled task was found, lets check if all servers are