Changeset 11662 for trunk/FACT++

Timestamp:

07/27/11 17:15:31 (13 years ago)

Author:

tbretz

Message:

Added header.fState to dynamic data.

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (3 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -40 +40 @@
 
     bool fHasHeader;
-    FTM::States fState;
 
     bool fIsVerbose;
@@ -1103 +1102 @@
             return kDisconnected;
 
-        switch (fHeader.fState)
+        switch (fHeader.fState&FTM::kFtmStates)
         {
         case FTM::kFtmUndefined:
@@ -1219 +1218 @@
         fDimFtuList       ("FTM_CONTROL/FTU_LIST",        "X:1;X:1;S:1;C:4;X:40;C:40;C:40",  ""),
         fDimStaticData    ("FTM_CONTROL/STATIC_DATA",     "X:1;S:1;S:1;X:1;S:1;S:3;S:1;S:1;S:1;S:1;S:1;S:1;I:1;I:8;S:90;S:160;S:40;S:40", ""),
-        fDimDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    "X:1;X:1;F:4;I:160;I:40;S:40;S:40", ""),
+        fDimDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    "X:1;X:1;F:4;I:160;I:40;S:40;S:40;S:1", ""),
         fDimCounter       ("FTM_CONTROL/COUNTER",         "I:6", "")
     {