Changeset 11665 for trunk

Timestamp:

07/27/11 17:16:54 (14 years ago)

Author:

tbretz

Message:

Added fState to DimDynamicData

File:

• trunk/FACT++/src/HeadersFTM.h (modified) (4 diffs)

trunk/FACT++/src/HeadersFTM.h

@@ -23 +23 @@
         kFtmRunning = 3, ///< Trigger output enabled, configuration ignored
         kFtmCalib   = 4,
+
+        kFtmStates  = 0x0ff,
+        kFtmLocked  = 0x100,
+
     };
+
+    // idle:    not locked: 0x2711
+    // running: not locked: 0x2713
 
     enum StateMachine
@@ -148 +155 @@
             fTimeStamp(h.fTimeStamp),
             fTriggerCounter(h.fTriggerCounter)
-        {
+       {
         }
     } __attribute__((__packed__));
@@ -284 +291 @@
                 fGeneralSettings |= uint16_t(type);
             else
-                fGeneralSettings &= ~uint16_t(type); }
+                fGeneralSettings &= ~uint16_t(type);
+        }
 
         bool IsEnabled(GeneralSettings type) const { return fGeneralSettings&uint16_t(type); }
@@ -515 +523 @@
         uint16_t fCrcError[40];
 
+        uint16_t fState;
+
         DimDynamicData(const Header &h, const DynamicData &d) :
             fTimeStamp(h.fTimeStamp),
-            fOnTimeCounter(d.fOnTimeCounter)
+            fOnTimeCounter(d.fOnTimeCounter),
+            fState(h.fState)
         {
             for (int i=0; i<4; i++)