Changeset 18649

Timestamp:

09/25/16 21:47:08 (8 years ago)

Author:

tbretz

Message:

It seems the camera reponse has more than one LF now... replace all of them. In addition (in view of the new mode) added a SUSPEND mode which is equal to SLEEP.

File:

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

trunk/FACT++/scripts/Main.js

@@ -180 +180 @@
         cam.data.push("Camera.Environment=OUTDOOR");
         var ret = cam.send();
-        dim.log("Camera response: "+ret.data.replace("\n","/")+" ["+ret.rc+"]");
+        dim.log("Camera response: "+ret.data.replace(/\n/g,"/")+" ["+ret.rc+"]");
     }
     dim.wait("LID_CONTROL", "Open", 30000);
@@ -1025 +1025 @@
         continue;
 
+    case "SUSPEND":
     case "SLEEP":
         Shutdown("sleep"); //GoToSleep();
 
         sub++;
-        dim.log("Task finished [SLEEP].");
+        dim.log("Task finished ["+obs[sub].task+"].");
         console.out("");
         continue;