Index: trunk/FACT++/scripts/CheckUnderflow.js
===================================================================
--- trunk/FACT++/scripts/CheckUnderflow.js	(revision 17659)
+++ trunk/FACT++/scripts/CheckUnderflow.js	(revision 17673)
@@ -39,10 +39,12 @@
 var table =
 [
- [ "MCP",             [ "Idle"      ] ],
- [ "AGILENT_CONTROL", [ "VoltageOn" ] ],
- [ "FTM_CONTROL",     [ "Valid"     ] ],
- [ "FAD_CONTROL",     [ "Connected",    "RunInProgress"   ] ],
- [ "BIAS_CONTROL",    [ "Disconnected", "VoltageOff"      ] ],
- [ "DATA_LOGGER",     [ "WaitForRun",   "NightlyFileOpen", "Logging" ] ],
+ [ "MCP",                 [ "Idle"      ] ],
+ [ "AGILENT_CONTROL_24V", [ "VoltageOn" ] ],
+ [ "AGILENT_CONTROL_50V", [ "VoltageOn" ] ],
+ [ "AGILENT_CONTROL_80V", [ "VoltageOn" ] ],
+ [ "FTM_CONTROL",         [ "Valid"     ] ],
+ [ "FAD_CONTROL",         [ "Connected",    "RunInProgress"   ] ],
+ [ "BIAS_CONTROL",        [ "Disconnected", "VoltageOff"      ] ],
+ [ "DATA_LOGGER",         [ "WaitForRun",   "NightlyFileOpen", "Logging" ] ],
 ];
 
@@ -68,5 +70,5 @@
 //    throw new Error("Could not connect to FAD_CONTROL/DRS_RUNS");
 
-var power = dim.state("AGILENT_CONTROL").time;
+var power = dim.state("AGILENT_CONTROL_50V").time;
 var now   = new Date();
 
Index: trunk/FACT++/scripts/Main.js
===================================================================
--- trunk/FACT++/scripts/Main.js	(revision 17659)
+++ trunk/FACT++/scripts/Main.js	(revision 17673)
@@ -481,4 +481,7 @@
     var expected =
         [
+         "AGILENT_CONTROL_24V/DATA",
+         "AGILENT_CONTROL_50V/DATA",
+         "AGILENT_CONTROL_80V/DATA",
          "BIAS_CONTROL/CURRENT",
          "BIAS_CONTROL/DAC",
@@ -846,19 +849,21 @@
          [ "SMART_FACT"    ],
          [ "TEMPERATURE"   ],
-         [ "DATA_LOGGER",     [ "NightlyFileOpen", "WaitForRun", "Logging" ] ],
-         [ "FSC_CONTROL",     [ "Connected"                ] ],
-         [ "MCP",             [ "Idle"                     ] ],
-         [ "TIME_CHECK",      [ "Valid"                    ] ],
-         [ "PWR_CONTROL",     power_states/*[ "SystemOn"                 ]*/ ],
-         [ "AGILENT_CONTROL", [ "VoltageOn"                ] ],
-         [ "BIAS_CONTROL",    [ "VoltageOff", "VoltageOn", "Ramping" ] ],
-         [ "FEEDBACK",        [ "Calibrated", "InProgress" ] ],
-         [ "LID_CONTROL",     [ "Open", "Closed"           ] ],
-         [ "DRIVE_CONTROL",   drive_states/*[ "Armed", "Tracking", "OnTrack" ]*/ ],
-         [ "FTM_CONTROL",     [ "Valid", "TriggerOn"       ] ],
-         [ "FAD_CONTROL",     [ "Connected", "RunInProgress" ] ],
-         [ "RATE_SCAN",       [ "Connected"                ] ],
-         [ "RATE_CONTROL",    [ "Connected", "GlobalThresholdSet", "InProgress"  ] ],
-         [ "GPS_CONTROL",     [ "Locked"  ] ],
+         [ "DATA_LOGGER",         [ "NightlyFileOpen", "WaitForRun", "Logging" ] ],
+         [ "FSC_CONTROL",         [ "Connected"                ] ],
+         [ "MCP",                 [ "Idle"                     ] ],
+         [ "TIME_CHECK",          [ "Valid"                    ] ],
+         [ "PWR_CONTROL",         power_states/*[ "SystemOn"                 ]*/ ],
+         [ "AGILENT_CONTROL_24V", [ "VoltageOn"                ] ],
+         [ "AGILENT_CONTROL_50V", [ "VoltageOn"                ] ],
+         [ "AGILENT_CONTROL_80V", [ "VoltageOn"                ] ],
+         [ "BIAS_CONTROL",        [ "VoltageOff", "VoltageOn", "Ramping" ] ],
+         [ "FEEDBACK",            [ "Calibrated", "InProgress" ] ],
+         [ "LID_CONTROL",         [ "Open", "Closed"           ] ],
+         [ "DRIVE_CONTROL",       drive_states/*[ "Armed", "Tracking", "OnTrack" ]*/ ],
+         [ "FTM_CONTROL",         [ "Valid", "TriggerOn"       ] ],
+         [ "FAD_CONTROL",         [ "Connected", "RunInProgress" ] ],
+         [ "RATE_SCAN",           [ "Connected"                ] ],
+         [ "RATE_CONTROL",        [ "Connected", "GlobalThresholdSet", "InProgress"  ] ],
+         [ "GPS_CONTROL",         [ "Locked"  ] ],
         ];
 
Index: trunk/FACT++/scripts/Startup.js
===================================================================
--- trunk/FACT++/scripts/Startup.js	(revision 17659)
+++ trunk/FACT++/scripts/Startup.js	(revision 17673)
@@ -54,11 +54,15 @@
 // -----------------------------------------------------------------
 
-include("scripts/handleAgilentPowerOn.js");
+include("scripts/handleAgilentPowerOn24V.js");
+include("scripts/handleAgilentPowerOn50V.js");
+include("scripts/handleAgilentPowerOn80V.js");
 include("scripts/handlePwrCameraOn.js");
 
-checkSend(["AGILENT_CONTROL","PWR_CONTROL"]);
+checkSend(["AGILENT_CONTROL_24V","AGILENT_CONTROL_50V","AGILENT_CONTROL_80V","PWR_CONTROL"]);
 
 loop = new Handler("PowerOn");
-//loop.add(handleAgilentPowerOn);
+//loop.add(handleAgilentPowerOn24V);
+//loop.add(handleAgilentPowerOn50V);
+//loop.add(handleAgilentPowerOn80V);
 loop.add(handlePwrCameraOn);
 loop.run();
@@ -296,19 +300,21 @@
  [ "SMART_FACT"    ],
  [ "TEMPERATURE"   ],
- [ "DATA_LOGGER",     [ "NightlyFileOpen", "WaitForRun", "Logging" ] ],
- [ "FSC_CONTROL",     [ "Connected"                       ] ],
- [ "MCP",             [ "Idle"                            ] ],
- [ "TIME_CHECK",      [ "Valid"                           ] ],
- [ "PWR_CONTROL",     [ "SystemOn"                        ] ],
- [ "AGILENT_CONTROL", [ "VoltageOn"                       ] ],
- [ "BIAS_CONTROL",    [ "VoltageOff"                      ] ],
- [ "FEEDBACK",        [ "Calibrated"                      ] ],
- [ "RATE_SCAN",       [ "Connected"                       ] ],
- [ "RATE_CONTROL",    [ "Connected"                       ] ],
- [ "LID_CONTROL",     [ "Open", "Closed"                  ] ],
- [ "DRIVE_CONTROL",   [ "Armed", "Tracking", "OnTrack", "Locked" ] ],
- [ "FTM_CONTROL",     [ "Valid", "TriggerOn"              ] ],
- [ "FAD_CONTROL",     [ "Connected", "WritingData"        ] ],
- [ "GPS_CONTROL",     [ "Locked" ] ],
+ [ "DATA_LOGGER",         [ "NightlyFileOpen", "WaitForRun", "Logging" ] ],
+ [ "FSC_CONTROL",         [ "Connected"                       ] ],
+ [ "MCP",                 [ "Idle"                            ] ],
+ [ "TIME_CHECK",          [ "Valid"                           ] ],
+ [ "PWR_CONTROL",         [ "SystemOn"                        ] ],
+ [ "AGILENT_CONTROL_24V", [ "VoltageOn"                       ] ],
+ [ "AGILENT_CONTROL_50V", [ "VoltageOn"                       ] ],
+ [ "AGILENT_CONTROL_80V", [ "VoltageOn"                       ] ],
+ [ "BIAS_CONTROL",        [ "VoltageOff"                      ] ],
+ [ "FEEDBACK",            [ "Calibrated"                      ] ],
+ [ "RATE_SCAN",           [ "Connected"                       ] ],
+ [ "RATE_CONTROL",        [ "Connected"                       ] ],
+ [ "LID_CONTROL",         [ "Open", "Closed"                  ] ],
+ [ "DRIVE_CONTROL",       [ "Armed", "Tracking", "OnTrack", "Locked" ] ],
+ [ "FTM_CONTROL",         [ "Valid", "TriggerOn"              ] ],
+ [ "FAD_CONTROL",         [ "Connected", "WritingData"        ] ],
+ [ "GPS_CONTROL",         [ "Locked" ] ],
 ];