From f0f206af10b25b8fc0d9a20e06e1ddbdeee0aedf Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Wed, 28 Nov 2018 16:05:06 +0100
Subject: [PATCH] updated example
---
example2a/demoApp2a.cc | 5 ++---
example2a/demoApp2a.xml | 4 ++++
2 files changed, 6 insertions(+), 3 deletions(-)
create mode 100644 example2a/demoApp2a.xml
diff --git a/example2a/demoApp2a.cc b/example2a/demoApp2a.cc
index 0fa48563..20f2ff08 100644
--- a/example2a/demoApp2a.cc
+++ b/example2a/demoApp2a.cc
@@ -60,14 +60,13 @@ static ExampleApp theExampleApp;
void ExampleApp::defineConnections() {
ChimeraTK::setDMapFilePath("example2.dmap");
- config.connectTo(cs);
+ config.connectTo(cs["Configuration"]);
if(config.get<int>("enableAutomation")) {
automation = Automation(this, "Automation", "Slow setpoint ramping algorithm");
automation.findTag("Controller").connectTo(controller);
- automation.findTag("CS").connectTo(cs);
timer.tick >> automation.trigger;
}
controller.findTag("DEV").connectTo(heater, timer.tick);
- controller.findTag("CS").connectTo(cs);
+ findTag("CS").connectTo(cs);
}
diff --git a/example2a/demoApp2a.xml b/example2a/demoApp2a.xml
new file mode 100644
index 00000000..d35553f3
--- /dev/null
+++ b/example2a/demoApp2a.xml
@@ -0,0 +1,4 @@
+<configuration>
+ <variable name="enableAutomation" type="int32" value="1"/>
+</configuration>
+
--
GitLab