Skip to content

Fsm beryl #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RPeschke wants to merge 2 commits into
base: fsm_beryl
Choose a base branch
from
Open

Fsm beryl #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e6ee7b
Added DLLExport statements for classes which are exported from the DLL
RPeschke Sep 2, 2015
861ba2e
using of the new interface of the set status class
RPeschke Sep 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion main/include/eudaq/MachineState.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
#include <map>
#include "eudaq/Status.hh"
#include "eudaq/TransportBase.hh"
#include "eudaq/Platform.hh"


namespace eudaq
{
class MachineState
class DLLEXPORT MachineState

{
public:
Expand Down
3 changes: 2 additions & 1 deletion main/include/eudaq/TransportBase.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
#include <iosfwd>
#include <cstring>
#include <iostream>
#include "eudaq/Platform.hh"

namespace eudaq {

/** Represents an individual connection on a Transport.
*
*/
class ConnectionInfo {
class DLLEXPORT ConnectionInfo {
public:
explicit ConnectionInfo(const std::string &name = "")
: m_state(0), m_name(name) {}
Expand Down
4 changes: 2 additions & 2 deletions producers/root/src/ROOTProducer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void ROOTProducer::Producer_PImpl::OnConfigure(const eudaq::Configuration & conf


// At the end, set the status that will be displayed in the Run Control.
SetStatus(eudaq::Status::LVL_OK, "Configured (" + config.Name() + ")");
SetStatus(eudaq::Status::STATE_CONF, "Configured (" + config.Name() + ")");
}

eudaq::Configuration& ROOTProducer::Producer_PImpl::getConfiguration()
Expand Down Expand Up @@ -258,7 +258,7 @@ void ROOTProducer::Producer_PImpl::OnStartRun(unsigned param)

// At the end, set the status that will be displayed in the Run Control.

SetStatus(eudaq::Status::LVL_OK, "Running");
SetStatus(eudaq::Status::STATE_RUNNING, "Running");
}

bool ROOTProducer::Producer_PImpl::timeout(int tries)
Expand Down