Skip to content
Snippets Groups Projects
Commit c194ac96 authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

fixed bug introduced in 936d7c0d

parent 14405df2
No related branches found
No related tags found
No related merge requests found
...@@ -127,9 +127,7 @@ namespace ChimeraTK { ...@@ -127,9 +127,7 @@ namespace ChimeraTK {
else { else {
auto firstSubmodule = moduleName.substr(0,slash); auto firstSubmodule = moduleName.substr(0,slash);
auto remainingSubmodules = moduleName.substr(slash+1); auto remainingSubmodules = moduleName.substr(slash+1);
auto &sm = createAndGetSubmodule(firstSubmodule); return createAndGetSubmodule(firstSubmodule).createAndGetSubmoduleRecursive(remainingSubmodules);
sm.createAndGetSubmoduleRecursive(remainingSubmodules);
return sm;
} }
} }
......
...@@ -209,6 +209,8 @@ BOOST_AUTO_TEST_CASE( testConnectTo ) { ...@@ -209,6 +209,8 @@ BOOST_AUTO_TEST_CASE( testConnectTo ) {
auto devint8 = dev.getScalarRegisterAccessor<int8_t>("/Integers/signed8"); auto devint8 = dev.getScalarRegisterAccessor<int8_t>("/Integers/signed8");
auto devuint8 = dev.getScalarRegisterAccessor<uint8_t>("/Integers/unsigned8"); auto devuint8 = dev.getScalarRegisterAccessor<uint8_t>("/Integers/unsigned8");
auto devfloat = dev.getScalarRegisterAccessor<double>("/FixedPoint/value"); auto devfloat = dev.getScalarRegisterAccessor<double>("/FixedPoint/value");
auto devDeep1 = dev.getScalarRegisterAccessor<int32_t>("/Deep/Hierarchies/Need/Tests/As/well");
auto devDeep2 = dev.getScalarRegisterAccessor<int32_t>("/Deep/Hierarchies/Need/Another/test");
auto csActuator = test.getScalar<int32_t>("/MyModule/actuator"); auto csActuator = test.getScalar<int32_t>("/MyModule/actuator");
auto csReadback = test.getScalar<int32_t>("/MyModule/readBack"); auto csReadback = test.getScalar<int32_t>("/MyModule/readBack");
auto csint32 = test.getScalar<int32_t>("/Integers/signed32"); auto csint32 = test.getScalar<int32_t>("/Integers/signed32");
...@@ -218,6 +220,8 @@ BOOST_AUTO_TEST_CASE( testConnectTo ) { ...@@ -218,6 +220,8 @@ BOOST_AUTO_TEST_CASE( testConnectTo ) {
auto csint8 = test.getScalar<int8_t>("/Integers/signed8"); auto csint8 = test.getScalar<int8_t>("/Integers/signed8");
auto csuint8 = test.getScalar<uint8_t>("/Integers/unsigned8"); auto csuint8 = test.getScalar<uint8_t>("/Integers/unsigned8");
auto csfloat = test.getScalar<double>("/FixedPoint/value"); auto csfloat = test.getScalar<double>("/FixedPoint/value");
auto csDeep1 = test.getScalar<int32_t>("/Deep/Hierarchies/Need/Tests/As/well");
auto csDeep2 = test.getScalar<int32_t>("/Deep/Hierarchies/Need/Another/test");
test.runApplication(); test.runApplication();
testDirectRegister(test, csActuator, devActuator, []{}); testDirectRegister(test, csActuator, devActuator, []{});
...@@ -229,5 +233,7 @@ BOOST_AUTO_TEST_CASE( testConnectTo ) { ...@@ -229,5 +233,7 @@ BOOST_AUTO_TEST_CASE( testConnectTo ) {
testDirectRegister(test, csint8, devint8, []{}); testDirectRegister(test, csint8, devint8, []{});
testDirectRegister(test, csuint8, devuint8, []{}); testDirectRegister(test, csuint8, devuint8, []{});
testDirectRegister(test, csfloat, devfloat, []{}, false); testDirectRegister(test, csfloat, devfloat, []{}, false);
testDirectRegister(test, csDeep1, devDeep1, []{});
testDirectRegister(test, csDeep2, devDeep2, []{});
} }
...@@ -8,3 +8,5 @@ ...@@ -8,3 +8,5 @@
/Integers/signed8 1 24 4 1 8 0 1 RW /Integers/signed8 1 24 4 1 8 0 1 RW
/Integers/unsigned8 1 28 4 1 8 0 0 RW /Integers/unsigned8 1 28 4 1 8 0 0 RW
/FixedPoint/value 1 32 4 1 32 8 1 RW /FixedPoint/value 1 32 4 1 32 8 1 RW
/Deep/Hierarchies/Need/Tests/As/well 1 36 4 1 32 0 1 RW
/Deep/Hierarchies/Need/Another/test 1 40 4 1 32 0 1 RW
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