Changeset 11587 for trunk/FACT++/src/mcp.cc

Timestamp:

07/25/11 19:14:00 (13 years ago)

Author:

tbretz

Message:

Allow RESET in Configuring3; do not disable trigger line before ftm trigger is not disabled.

File:

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

trunk/FACT++/src/mcp.cc

@@ -180 +180 @@
         if (fStatusFAD.second==FAD::kConnected)
         {
-            Dim::SendCommand("FAD_CONTROL/ENABLE_TRIGGER_LINE",      bool(false));
+            //Dim::SendCommand("FAD_CONTROL/ENABLE_TRIGGER_LINE",      bool(false));
             Dim::SendCommand("FAD_CONTROL/ENABLE_CONTINOUS_TRIGGER", bool(false));
         }
@@ -190 +190 @@
     {
         fRunType = "";
+        Dim::SendCommand("FTM_CONTROL/RESET_CONFIGURE");
+        Dim::SendCommand("FAD_CONTROL/RESET_CONFIGURE");
         return kStateIdle;
         /*
@@ -393 +395 @@
             ("");
 
-        AddEvent("RESET", kStateConfiguring1, kStateConfiguring2, kStateConfigured)
+        AddEvent("RESET", kStateConfiguring1, kStateConfiguring2, kStateConfiguring3, kStateConfigured)
             (bind(&StateMachineMCP::Reset, this, placeholders::_1))
             ("");