Skip to content
Snippets Groups Projects
Commit 5b57e25d authored by Zenker, Dr. Klaus (FWKE) - 126506's avatar Zenker, Dr. Klaus (FWKE) - 126506
Browse files

Add support for direct connection of a device to MicroDAQ module.

parent 2277f33c
No related branches found
No related tags found
No related merge requests found
......@@ -66,6 +66,10 @@ namespace ChimeraTK {
/** Add a Module as a source to this DAQ. */
void addSource(const Module& source, const RegisterPath& namePrefix = "");
/**
* Overload that calls virtualiseFromCatalog.
*/
void addSource(const DeviceModule& source, const RegisterPath& namePrefix = "");
protected:
void mainLoop() override;
......
......@@ -78,6 +78,14 @@ namespace ChimeraTK {
/*********************************************************************************************************************/
template<typename TRIGGERTYPE>
void MicroDAQ<TRIGGERTYPE>::addSource(const DeviceModule& source, const RegisterPath& namePrefix) {
auto mod = source.virtualiseFromCatalog();
addSource(mod, namePrefix);
}
/*********************************************************************************************************************/
template<typename TRIGGERTYPE>
template<typename UserType>
VariableNetworkNode MicroDAQ<TRIGGERTYPE>::getAccessor(const std::string& variableName) {
......
......@@ -268,6 +268,8 @@ namespace ChimeraTK {
friend class Application;
friend struct history::ServerHistory;
template<typename TRIGGERTYPE>
friend class MicroDAQ;
friend class detail::DeviceModuleProxy;
template<typename T>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment