Changeset 16784 for trunk/FACT++/src

Timestamp:

06/10/13 11:36:30 (11 years ago)

Author:

tbretz

Message:

Adapted the state checks according to the recent change in the ftmctrl.

File:

• trunk/FACT++/src/mcp.cc (modified) (2 diffs)

trunk/FACT++/src/mcp.cc

@@ -332 +332 @@
         if (GetCurrentState()==MCP::State::kConfiguring2)
         {
-            if (fDimFTM.state() != FTM::State::kConfigured ||
+            if (fDimFTM.state() != FTM::State::kConfigured1 ||
                 fDimLog.state()<30 || fDimLog.state()>0xff ||
                 fDimRC.state()!=RateControl::State::kConnected)
@@ -370 +370 @@
             */
             // If something is not yet properly configured: keep state
-            if (fDimFTM.state() != FTM::State::kConfigured ||
+            if (fDimFTM.state() != FTM::State::kConfigured1 ||
                 fDimFAD.state() != FAD::State::kConfigured ||
                 fDimRC.state()  <= RateControl::State::kSettingGlobalThreshold)