Changeset 11296 for trunk

Timestamp:

07/08/11 15:42:43 (13 years ago)

Author:

tbretz

Message:

Moved state definitions here; added operator== to StaticData

File:

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

trunk/FACT++/src/HeadersFTM.h

@@ -10 +10 @@
 
 // ====================================================================
+
 
 namespace FTM
@@ -15 +16 @@
     enum States
     {
-        // State Machine states
-        kDisconnected = 1,
-        kConnected,
-        kIdle,
-        kTakingData,
+        kFtmUndefined = 0,
 
         // FTM internal states
@@ -26 +23 @@
         kFtmRunning = 3, ///< Trigger output enabled, configuration ignored
         kFtmCalib   = 4,
+    };
+
+    enum StateMachine
+    {
+        kDisconnected = 1, //ConnectionFTM::kDisconnected,
+        kConnected    ,//= ConnectionFTM::kConnected,
+        kIdle         ,//= ConnectionFTM::kIdle,
+        kTakingData   ,//= ConnectionFTM::kTakingData,
+        kConfiguring1,
+        kConfiguring2,
+        kConfigured,
+
+        kConfigError1 = 0x101,
+        kConfigError2 = 0x102,
+
+        kCmdTest
     };
 
@@ -218 +231 @@
             for (int i=0; i<8; i++)
                 Reverse(fClockConditioner+i);
+        }
+
+        bool operator==(const StaticData &d) const
+        {
+            return memcmp(this, &d, sizeof(StaticData))==0;
         }