Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
mroda88 committed Nov 21, 2024
1 parent 73ca79a commit 210f77c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion schema/appmodel/PDS.schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
</method>
</class>

<class name="DaphneControllerModule">
<class name="DaphneV2ControllerModule">
<superclass name="DaqModule"/>
<attribute name="address" description="ip address of the board" type="string" is-not-null="yes"/>
<attribute name="slot" description="slot of the board" type="u16" is-not-null="yes"/>
Expand Down
6 changes: 3 additions & 3 deletions src/DaphneApplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include "appmodel/FelixDataSender.hpp"
#include "appmodel/DaphneConf.hpp"
#include "appmodel/DaphneControllerModule.hpp"
#include "appmodel/DaphneV2ControllerModule.hpp"
#include "appmodel/DaphneApplication.hpp"


Expand Down Expand Up @@ -91,12 +91,12 @@ DaphneApplication::generate_modules(conffwk::Configuration* config,

conffwk::ConfigObject module_obj;
std::string module_name = fmt::format("controller-{}", slot);
config -> create( dbfile, "DaphneControllerModule", module_name, module_obj);
config -> create( dbfile, "DaphneV2ControllerModule", module_name, module_obj);
module_obj.set_by_val<std::string>("address", ip);
module_obj.set_by_val<uint16_t>("slot", slot);
module_obj.set_obj("daphne_conf", & daphne_conf -> config_object() );

modules.push_back(config->get<appmodel::DaphneControllerModule>(module_obj));
modules.push_back(config->get<appmodel::DaphneV2ControllerModule>(module_obj));

} // loop over data senders

Expand Down

0 comments on commit 210f77c

Please sign in to comment.