Changeset 11378


Ignore:
Timestamp:
07/13/11 18:36:11 (13 years ago)
Author:
tbretz
Message:
Updated the bahaviour of the CONFIGURE command.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/ftmctrl.cc

    r11372 r11378  
    16291629        case ConnectionFTM::kDisconnected: return FTM::kDisconnected;
    16301630        case ConnectionFTM::kConnected:    return FTM::kConnected;
    1631         case ConnectionFTM::kTakingData:   return FTM::kTakingData;
    16321631        default:
    16331632            break;
     
    16851684            case ConnectionFTM::kIdle:         return FTM::kIdle;
    16861685            case ConnectionFTM::kConfigured:   return FTM::kIdle;
     1686            case ConnectionFTM::kTakingData:   return FTM::kTakingData;
    16871687            default:
    16881688                throw runtime_error("StateMachienFTM - Execute() - Inavlid state.");
    16891689            }
    16901690        }
     1691
     1692        if (T::GetCurrentState()==FTM::kConfigured &&
     1693            fFTM.GetState()==ConnectionFTM::kTakingData)
     1694            return FTM::kTakingData;
    16911695
    16921696        return T::GetCurrentState();
     
    18951899            ("");
    18961900
     1901        // A new configure will first stop the FTM this means
     1902        // we can allow it in idle _and_ taking data
    18971903        T::AddEvent("CONFIGURE", "C", FTM::kIdle, FTM::kTakingData)
    18981904            (boost::bind(&StateMachineFTM::ConfigureFTM, this, _1))
Note: See TracChangeset for help on using the changeset viewer.