Skip to content

add device name as optional constructor arg. #38

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

Merged
brichards64 merged 1 commit into from
Sep 30, 2026
Merged

add device name as optional constructor arg. #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion include/DAQInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace ToolFramework {

public:

DAQInterface(std::string configuration_file, zmq::context_t* context=0);
DAQInterface(std::string configuration_file, zmq::context_t* context=0, const char* device_name=nullptr);
~DAQInterface();

bool SQLQuery(const std::string& query, std::vector<std::string>& responses, const unsigned int timeout=default_timeout);
Expand Down
3 changes: 2 additions & 1 deletion src/DAQInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

using namespace ToolFramework;

DAQInterface::DAQInterface(std::string configuration_file, zmq::context_t* context){
DAQInterface::DAQInterface(std::string configuration_file, zmq::context_t* context, const char* device_name){

if(!vars.Initialise(configuration_file)){
std::clog<<"Error invalid configuration file given to DAQ Interface: "<<configuration_file<<std::endl;
}

if(!vars.Get("device_name",m_name)) m_name = "unnamed";
if(device_name!=nullptr) m_name=device_name;
vars.Set("service_name",m_name);

boost::uuids::uuid m_UUID;
Expand Down
Loading