Changeset 16441

Timestamp:

05/29/13 18:20:14 (11 years ago)

Author:

tbretz

Message:

Some updates to the output; added a timeout when waiting for the voltage to be ramped correctly.

File:

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

trunk/FACT++/scripts/Main.js

@@ -195 +195 @@
         return;
 
-    this.voltageStep = null;
     if (!evt.data)
         return;
@@ -216 +215 @@
     this.previous = avg;
 
-    console.out("  DeltaV="+this.voltageStep);
+    console.out("  DeltaV=%.3f".$(this.voltageStep));
 }
 
@@ -253 +252 @@
 
         // Switch voltage off
-        console.out("  Voltage on: switch off");
+        console.out("  "+new Date().toUTCString()+": Voltage off: switch off");
         dim.send("BIAS_CONTROL/SET_ZERO_VOLTAGE");
 
@@ -303 +302 @@
     if (isOff)
     {
-        console.out("  Voltage on: switch on");
+        console.out("  "+new Date().toUTCString()+": Voltage on: switch on");
         //console.out(JSON.stringify(dim.state("BIAS_CONTROL")));
 
@@ -347 +346 @@
     console.out("  Feedback wait: start");
 
-    function func(service)
-    {
-        if ((service.cnt!=undefined && service.get().counter>service.cnt+10) ||
-            (service.voltageStep && service.voltageStep<0.02))
+    function func()
+    {
+        if ((this.cnt!=undefined && this.get().counter>this.cnt+10) ||
+            (this.voltageStep && this.voltageStep<0.02))
             return true;
     }
 
     var now = new Date();
-    //v8.timeout(5*60000, func, this);
-    while ((this.cnt==undefined || this.get().counter<=this.cnt+10) && (!this.voltageStep || this.voltageStep>0.02))
-        v8.sleep(100);
+
+    v8.timeout(4*60000, func, this);
 
     console.out("  Feedback wait: end [dV=%.3f, cnt=%d, %.2fs]".$(this.voltageStep, this.get().counter, (new Date()-now)/1000));