Changeset 11609 for trunk/FACT++/src

Timestamp:

07/26/11 13:01:08 (13 years ago)

Author:

tbretz

Message:

Updated allowed states.

File:

• trunk/FACT++/src/fadctrl.cc (modified) (6 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -1531 +1531 @@
 
         // FAD Commands
-        T::AddEvent("SEND_CMD", "I:1")
+        T::AddEvent("SEND_CMD", "I:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::SendCmd, this, placeholders::_1))
             ("Send a command to the FADs. Values between 0 and 0xffff are allowed."
              "|command[uint16]:Command to be transmittted.");
-        T::AddEvent("SEND_DATA", "I:2")
+        T::AddEvent("SEND_DATA", "I:2", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::SendCmdData, this, placeholders::_1))
             ("Send a command with data to the FADs. Values between 0 and 0xffff are allowed."
@@ -1541 +1541 @@
              "|data[uint16]:Data to be sent with the command.");
 
-        T::AddEvent("ENABLE_SRCLK", "B:1")
+        T::AddEvent("ENABLE_SRCLK", "B:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdSrclk))
             ("Set SRCLK");
-        T::AddEvent("ENABLE_BUSY", "B:1")
+        T::AddEvent("ENABLE_BUSY", "B:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdBusy))
             ("Set BUSY");
-        T::AddEvent("ENABLE_SCLK", "B:1")
+        T::AddEvent("ENABLE_SCLK", "B:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdSclk))
             ("Set SCLK");
-        T::AddEvent("ENABLE_DRS", "B:1")
+        T::AddEvent("ENABLE_DRS", "B:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdDrsEnable))
             ("Switch Domino wave");
-        T::AddEvent("ENABLE_DWRITE", "B:1")
+        T::AddEvent("ENABLE_DWRITE", "B:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdDwrite))
             ("Set Dwrite (possibly high / always low)");
-        T::AddEvent("ENABLE_CONTINOUS_TRIGGER", "B:1")
+        T::AddEvent("ENABLE_CONTINOUS_TRIGGER", "B:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdContTrigger))
             ("Enable continous (internal) trigger.");
-        T::AddEvent("ENABLE_TRIGGER_LINE", "B:1")
+        T::AddEvent("ENABLE_TRIGGER_LINE", "B:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdTriggerLine))
             ("Incoming triggers can be accepted/will not be accepted");
-        T::AddEvent("ENABLE_COMMAND_SOCKET_MODE", "B:1")
+        T::AddEvent("ENABLE_COMMAND_SOCKET_MODE", "B:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdSocket))
             ("Set debug mode (yes: dump events through command socket, no=dump events through other sockets)");
 
-        T::AddEvent("SET_TRIGGER_RATE", "I:1")
+        T::AddEvent("SET_TRIGGER_RATE", "I:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::SetTriggerRate, this, placeholders::_1))
             ("Enable continous trigger");
-        T::AddEvent("SEND_SINGLE_TRIGGER")
+        T::AddEvent("SEND_SINGLE_TRIGGER", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::Trigger, this, 1))
             ("Issue software triggers");
-        T::AddEvent("SEND_N_TRIGGERS", "I")
+        T::AddEvent("SEND_N_TRIGGERS", "I", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::SendTriggers, this, placeholders::_1))
             ("Issue software triggers");
-        T::AddEvent("START_RUN", "")
+        T::AddEvent("START_RUN", "", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::StartRun, this, placeholders::_1, true))
             ("Set FAD DAQ mode. when started, no configurations must be send.");
-        T::AddEvent("STOP_RUN")
+        T::AddEvent("STOP_RUN", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::StartRun, this, placeholders::_1, false))
             ("");
-        T::AddEvent("PHASE_SHIFT", "S:1")
+        T::AddEvent("PHASE_SHIFT", "S:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::PhaseShift, this, placeholders::_1))
             ("Adjust ADC phase (in 'steps')");
 
-        T::AddEvent("RESET_EVENT_COUNTER")
+        T::AddEvent("RESET_EVENT_COUNTER", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::Cmd, this, FAD::kCmdResetEventCounter))
             ("");
 
-        T::AddEvent("SET_RUN_NUMBER", "X:1")
+        T::AddEvent("SET_RUN_NUMBER", "X:1", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::SetRunNumber, this, placeholders::_1))
             ("");
@@ -1598 +1598 @@
              "|memory[short]:Buffer size in Mega-bytes.");
 
-        T::AddEvent("SET_REGISTER", "I:2")
+        T::AddEvent("SET_REGISTER", "I:2", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::SetRegister, this, placeholders::_1))
             ("set register to value"
@@ -1605 +1605 @@
 
         // FIXME:  Maybe add a mask which channels should be set?
-        T::AddEvent("SET_REGION_OF_INTEREST", "I:2")
+        T::AddEvent("SET_REGION_OF_INTEREST", "I:2", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::SetRoi, this, placeholders::_1))
             ("Set region-of-interest to value"
@@ -1612 +1612 @@
 
         // FIXME:  Maybe add a mask which channels should be set?
-        T::AddEvent("SET_DAC_VALUE", "I:2")
+        T::AddEvent("SET_DAC_VALUE", "I:2", FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::SetDac, this, placeholders::_1))
             ("Set DAC numbers in range to value"
@@ -1691 +1691 @@
              "|enable[bool]:Whether the event builder should ignore data from this slot (yes) or allowed (no)");
 
-        T::AddEvent("CLOSE_OPEN_FILES", FAD::kConnecting, FAD::kConnected)
+        T::AddEvent("CLOSE_OPEN_FILES", FAD::kDisconnected, FAD::kConnecting, FAD::kConnected)
             (bind(&StateMachineFAD::CloseOpenFiles, this))
             ("Close all run files opened by the EventBuilder.");