Changeset 14355 for trunk/FACT++/src

Timestamp:

08/13/12 10:33:33 (12 years ago)

Author:

tbretz

Message:

fDimFTM should be a described stat for the PRINT command; the switch from disconnected to connected can be bound to a change of the ftmctrl state into HandleFtmstateChange.

File:

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

trunk/FACT++/src/ratescan.cc

@@ -34 +34 @@
 private:
     DimVersion fDim;
-    DimState   fDimFTM;
-
+
+    DimDescribedState   fDimFTM;
     DimDescribedService fDimData;
     DimDescribedService fDimProc;
@@ -248 +248 @@
     int HandleFtmStateChange(/*const EventImp &evt*/)
     {
+        // All subsystems are not connected
+        if (fDimFTM.state()<FTM::State::kConnected)
+            return RateScan::State::kDisconnected;
+
+        // ftmctrl connected to FTM
+        if (GetCurrentState()==RateScan::State::kDisconnected)
+            return RateScan::State::kConnected;
+
         if (GetCurrentState()!=RateScan::State::kConfiguring)
             return GetCurrentState();
@@ -367 +375 @@
         if (!fDim.online())
             return RateScan::State::kDimNetworkNA;
-
-        // All subsystems are not connected
-        if (fDimFTM.state()<FTM::State::kConnected)
-            return RateScan::State::kDisconnected;
 
         return GetCurrentState();