Changeset 13528 for trunk/FACT++/src/smartfact.cc

Timestamp:

05/02/12 22:57:14 (13 years ago)

Author:

tbretz

Message:

Added missing infoHandlers for drive control.

File:

• trunk/FACT++/src/smartfact.cc (modified) (6 diffs)

trunk/FACT++/src/smartfact.cc

@@ -194 +194 @@
     }
 
-    void HandleDrivePointing(const DimData &d)
+    void HandleDriveControlPointing(const DimData &d)
     {
         if (!CheckDataSize(d, "DriveControl:Pointing", 7*4+2))
@@ -225 +225 @@
     }
 
-    void HandleDriveTracking(const DimData &d)
+    void HandleDriveControlTracking(const DimData &d)
     {
         if (!CheckDataSize(d, "DriveControl:Tracking", 7*4+2))
@@ -242 +242 @@
     }
 
-    void HandleDriveSource(const DimData &d)
+    void HandleDriveControlSource(const DimData &d)
     {
         if (!CheckDataSize(d, "DriveControl:Source", 7*4+2))
@@ -401 +401 @@
         if (HandleService(curr, fDimMagicWeatherData,       &StateMachineSmartFACT::HandleMagicWeatherData))
             return;
+        if (HandleService(curr, fDimDriveControlPointing,   &StateMachineSmartFACT::HandleDriveControlPointing))
+            return;
+        if (HandleService(curr, fDimDriveControlTracking,   &StateMachineSmartFACT::HandleDriveControlTracking))
+            return;
+        if (HandleService(curr, fDimDriveControlSource,     &StateMachineSmartFACT::HandleDriveControlSource))
+            return;
         if (HandleService(curr, fDimFeedbackCalibration,    &StateMachineSmartFACT::HandleFeedbackCalibration))
             return;
@@ -413 +419 @@
 
         if (UpdateState(curr, fDimMagicWeather, fStatusMagicWeather))
+            return;
+        if (UpdateState(curr, fDimDriveControl, fStatusDriveControl))
             return;
         if (UpdateState(curr, fDimFeedback, fStatusFeedback))
@@ -518 +526 @@
         }
         else
-            out << kWhite << "\n";
+            out << kWhite << "\t" << fStatusDriveControl.second << "\n";
 
         // --------------- MagicWeather -------------