diff --git a/example/demoApp.cc b/example/demoApp.cc index 71fa2f8d61ae048bb271d23cfaad86656340bb26..a0f2746ba21ff36253aa0461c37fe335e4fbfe10 100644 --- a/example/demoApp.cc +++ b/example/demoApp.cc @@ -106,7 +106,7 @@ class MyApp : public ctk::Application { simulator.actuator.consumeFromDevice("Dummy0","/MyModule/Variable", ctk::UpdateMode::poll); //simulator.actuator.feedToControlSystem("MyLocation/actuatorSimulator"); // not allowed, since simulator.actuator consuming - publishDeviceReadRegister<double>("Dummy0","/MyModule/Variable", ctk::UpdateMode::poll, "MyLocation/actuatorSimulator"); + feedDeviceRegisterToControlSystem<double>("Dummy0","/MyModule/Variable", ctk::UpdateMode::poll, "MyLocation/actuatorSimulator"); simulator.readback.connectTo(controlLoop.readback); simulator.readback.feedToControlSystem("MyLocation/readback"); diff --git a/include/Application.h b/include/Application.h index 486e98b19b6aa5fff1d1bd8a90f8bb718c06a15f..46b660018b575cde8c5aeed3aef4d8389564b465 100644 --- a/include/Application.h +++ b/include/Application.h @@ -89,13 +89,13 @@ namespace ChimeraTK { /** Register a connection between a device read-only register and the control system adapter */ template<typename UserType> - void publishDeviceReadRegister(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, - const std::string& publicName); + void feedDeviceRegisterToControlSystem(const std::string &deviceAlias, const std::string ®isterName, + UpdateMode mode, const std::string& publicName); /** Register a connection between a device write-only register and the control system adapter */ template<typename UserType> - void publishDeviceWriteRegister(const std::string& publicName, - const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); + void consumeDeviceRegisterFromControlSystem(const std::string &deviceAlias, const std::string ®isterName, + UpdateMode mode, const std::string& publicName); /** Perform the actual connection of an accessor to a device register */ template<typename UserType> diff --git a/src/Application.cc b/src/Application.cc index f6c2bc7b881d9b7b7465dc8f18819abb7d6729f5..ffdaf738dd3826cdc08d72be51e3b51f5336dbe8 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -387,41 +387,41 @@ VariableNetwork& Application::findNetwork(AccessorBase *a) { /*********************************************************************************************************************/ template<typename UserType> -void Application::publishDeviceReadRegister(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, - const std::string& publicName) { +void Application::feedDeviceRegisterToControlSystem(const std::string &deviceAlias, const std::string ®isterName, + UpdateMode mode, const std::string& publicName) { VariableNetwork network; network.addFeedingDeviceRegister(typeid(UserType), deviceAlias, registerName, mode); network.addConsumingPublication(publicName); networkList.push_back(network); } -template void Application::publishDeviceReadRegister<int8_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); -template void Application::publishDeviceReadRegister<uint8_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); -template void Application::publishDeviceReadRegister<int16_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); -template void Application::publishDeviceReadRegister<uint16_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); -template void Application::publishDeviceReadRegister<int32_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); -template void Application::publishDeviceReadRegister<uint32_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); -template void Application::publishDeviceReadRegister<float>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); -template void Application::publishDeviceReadRegister<double>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::feedDeviceRegisterToControlSystem<int8_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::feedDeviceRegisterToControlSystem<uint8_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::feedDeviceRegisterToControlSystem<int16_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::feedDeviceRegisterToControlSystem<uint16_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::feedDeviceRegisterToControlSystem<int32_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::feedDeviceRegisterToControlSystem<uint32_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::feedDeviceRegisterToControlSystem<float>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::feedDeviceRegisterToControlSystem<double>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); /*********************************************************************************************************************/ template<typename UserType> -void Application::publishDeviceWriteRegister(const std::string& publicName, - const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode) { +void Application::consumeDeviceRegisterFromControlSystem(const std::string &deviceAlias, const std::string ®isterName, + UpdateMode mode, const std::string& publicName) { VariableNetwork network; network.addFeedingPublication(typeid(UserType), publicName); network.addConsumingDeviceRegister(deviceAlias, registerName, mode); networkList.push_back(network); } -template void Application::publishDeviceWriteRegister<int8_t>(const std::string& publicName, const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); -template void Application::publishDeviceWriteRegister<uint8_t>(const std::string& publicName, const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); -template void Application::publishDeviceWriteRegister<int16_t>(const std::string& publicName, const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); -template void Application::publishDeviceWriteRegister<uint16_t>(const std::string& publicName, const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); -template void Application::publishDeviceWriteRegister<int32_t>(const std::string& publicName, const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); -template void Application::publishDeviceWriteRegister<uint32_t>(const std::string& publicName, const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); -template void Application::publishDeviceWriteRegister<float>(const std::string& publicName, const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); -template void Application::publishDeviceWriteRegister<double>(const std::string& publicName, const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode); +template void Application::consumeDeviceRegisterFromControlSystem<int8_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::consumeDeviceRegisterFromControlSystem<uint8_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::consumeDeviceRegisterFromControlSystem<int16_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::consumeDeviceRegisterFromControlSystem<uint16_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::consumeDeviceRegisterFromControlSystem<int32_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::consumeDeviceRegisterFromControlSystem<uint32_t>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::consumeDeviceRegisterFromControlSystem<float>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); +template void Application::consumeDeviceRegisterFromControlSystem<double>(const std::string &deviceAlias, const std::string ®isterName, UpdateMode mode, const std::string& publicName); /*********************************************************************************************************************/