Changeset 14522 for trunk/FACT++/src

Timestamp:

10/24/12 12:40:33 (12 years ago)

Author:

tbretz

Message:

Added some abbreviations for combined states.

Location:

trunk/FACT++/src

Files:

• HeadersPower.h (modified) (1 diff)
• pwrctrl.cc (modified) (1 diff)

trunk/FACT++/src/HeadersPower.h

@@ -17 +17 @@
             kConnected,
             kSystemOff,
-            kCameraOn =  4,
-            kBiasOn   =  8,
-            kDriveOn  = 16,
-            kSystemOn = kCameraOn|kBiasOn|kDriveOn,
+            kCameraOn  =  4,
+            kBiasOn    =  8,
+            kDriveOn   = 16,
+            kCameraOff = kBiasOn|kDriveOn,
+            kBiasOff   = kCameraOn|kDriveOn,
+            kDriveOff  = kCameraOn|kBiasOn,
+            kSystemOn  = kCameraOn|kBiasOn|kDriveOn,
             kCoolingFailure
         };

trunk/FACT++/src/pwrctrl.cc

@@ -449 +449 @@
                      "Drive and Bias power off, Camera on");
 
-        T::AddStateName(Power::State::kDriveOn|Power::State::kCameraOn, "BiasOff",
+        T::AddStateName(Power::State::kBiasOff, "BiasOff",
                      "Camera and Drive power on, Bias off");
 
-        T::AddStateName(Power::State::kBiasOn|Power::State::kCameraOn, "DriveOff",
+        T::AddStateName(Power::State::kDriveOff, "DriveOff",
                      "Camera and Bias power on, Drive off");
 
-        T::AddStateName(Power::State::kDriveOn|Power::State::kBiasOn, "CameraOff",
+        T::AddStateName(Power::State::kCameraOff, "CameraOff",
                      "Drive and Bias power on, Camera off");
 
-        T::AddStateName(Power::State::kDriveOn|Power::State::kBiasOn|Power::State::kCameraOn, "SystemOn",
+        T::AddStateName(Power::State::kSystemOn, "SystemOn",
                      "Camera, Bias and drive power on");