Changeset 11378 for trunk

Timestamp:

07/13/11 18:36:11 (13 years ago)

Author:

tbretz

Message:

Updated the bahaviour of the CONFIGURE command.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -1629 +1629 @@
         case ConnectionFTM::kDisconnected: return FTM::kDisconnected;
         case ConnectionFTM::kConnected:    return FTM::kConnected;
-        case ConnectionFTM::kTakingData:   return FTM::kTakingData;
         default:
             break;
@@ -1685 +1684 @@
             case ConnectionFTM::kIdle:         return FTM::kIdle;
             case ConnectionFTM::kConfigured:   return FTM::kIdle;
+            case ConnectionFTM::kTakingData:   return FTM::kTakingData;
             default:
                 throw runtime_error("StateMachienFTM - Execute() - Inavlid state.");
             }
         }
+
+        if (T::GetCurrentState()==FTM::kConfigured &&
+            fFTM.GetState()==ConnectionFTM::kTakingData)
+            return FTM::kTakingData;
 
         return T::GetCurrentState();
@@ -1895 +1899 @@
             ("");
 
+        // A new configure will first stop the FTM this means
+        // we can allow it in idle _and_ taking data
         T::AddEvent("CONFIGURE", "C", FTM::kIdle, FTM::kTakingData)
             (boost::bind(&StateMachineFTM::ConfigureFTM, this, _1))