From acb24ebef35a1ca18c48d9a1354d003fdf52cc95 Mon Sep 17 00:00:00 2001 From: Alois Zoitl Date: Thu, 22 Feb 2024 21:23:48 +0100 Subject: [PATCH] Renamed initHandle to createIOHandle to better reflect the task Also this allows to better distinquish from a second initHandle used for registering handles. --- src/core/io/device/io_controller.cpp | 2 +- src/core/io/device/io_controller.h | 2 +- src/core/io/device/io_controller_multi.cpp | 2 +- src/core/io/device/io_controller_multi.h | 2 +- src/modules/PLCnext/deviceController.cpp | 2 +- src/modules/PLCnext/deviceController.h | 2 +- src/modules/eliteboard/handler/EliteBoardDeviceController.cpp | 2 +- src/modules/eliteboard/handler/EliteBoardDeviceController.h | 2 +- src/modules/eliteboard/types/Port.cpp | 2 +- src/modules/embrick/handler/bus.cpp | 2 +- src/modules/embrick/handler/bus.h | 2 +- src/modules/wagokbus/modular/wagoDeviceController.cpp | 2 +- src/modules/wagokbus/modular/wagoDeviceController.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/core/io/device/io_controller.cpp b/src/core/io/device/io_controller.cpp index 8842fd95a..8a9c58641 100644 --- a/src/core/io/device/io_controller.cpp +++ b/src/core/io/device/io_controller.cpp @@ -53,7 +53,7 @@ void IODeviceController::run() { } void IODeviceController::addHandle(HandleDescriptor &paHandleDescriptor) { - IOHandle* handle = initHandle(paHandleDescriptor); + IOHandle* handle = createIOHandle(paHandleDescriptor); if(nullptr == handle) { DEVLOG_WARNING("[IODeviceController] Failed to initialize handle '%s'. Check initHandle method.\n", paHandleDescriptor.mId.c_str()); diff --git a/src/core/io/device/io_controller.h b/src/core/io/device/io_controller.h index 20f7571c3..73c0a5315 100644 --- a/src/core/io/device/io_controller.h +++ b/src/core/io/device/io_controller.h @@ -163,7 +163,7 @@ namespace forte { * * @param paHandleDescriptor Descriptor of the handle */ - virtual IOHandle* initHandle(HandleDescriptor &paHandleDescriptor) = 0; + virtual IOHandle* createIOHandle(HandleDescriptor &paHandleDescriptor) = 0; /*! @brief Iterates over all input handles and fires an indication event in case of a change. * diff --git a/src/core/io/device/io_controller_multi.cpp b/src/core/io/device/io_controller_multi.cpp index 29f5441b7..4901c483d 100644 --- a/src/core/io/device/io_controller_multi.cpp +++ b/src/core/io/device/io_controller_multi.cpp @@ -21,7 +21,7 @@ IODeviceMultiController::IODeviceMultiController(CDeviceExecution& paDeviceExecu void IODeviceMultiController::addHandle(IODeviceController::HandleDescriptor &paHandleDescriptor) { HandleDescriptor& desc = static_cast(paHandleDescriptor); - IOHandle* handle = initHandle(desc); + IOHandle* handle = createIOHandle(desc); if(nullptr == handle) { DEVLOG_WARNING("[IODeviceMultiController] Failed to initialize handle '%s'. Check initHandle method.\n", desc.mId.c_str()); diff --git a/src/core/io/device/io_controller_multi.h b/src/core/io/device/io_controller_multi.h index eeae5d292..fdc17bca5 100644 --- a/src/core/io/device/io_controller_multi.h +++ b/src/core/io/device/io_controller_multi.h @@ -67,7 +67,7 @@ namespace forte { void addHandle(IODeviceController::HandleDescriptor &paHandleDescriptor) override; - IOHandle* initHandle(IODeviceController::HandleDescriptor &paHandleDescriptor) override = 0; + IOHandle* createIOHandle(IODeviceController::HandleDescriptor &paHandleDescriptor) override = 0; private: diff --git a/src/modules/PLCnext/deviceController.cpp b/src/modules/PLCnext/deviceController.cpp index c53958319..cf8add9ba 100644 --- a/src/modules/PLCnext/deviceController.cpp +++ b/src/modules/PLCnext/deviceController.cpp @@ -42,7 +42,7 @@ void PLCnextDeviceController::registerSlaveHandler(PLCnextSlaveHandler *slave) { mSlaves->pushBack(slave); } -forte::core::io::IOHandle* PLCnextDeviceController::initHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) { +forte::core::io::IOHandle* PLCnextDeviceController::createIOHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) { HandleDescriptor& desc = static_cast(paHandleDescriptor); PLCnextSlaveHandler* slave = getSlave(desc.mSlaveIndex); diff --git a/src/modules/PLCnext/deviceController.h b/src/modules/PLCnext/deviceController.h index 41b21edf3..304c5b089 100644 --- a/src/modules/PLCnext/deviceController.h +++ b/src/modules/PLCnext/deviceController.h @@ -62,7 +62,7 @@ class PLCnextDeviceController : public forte::core::io::IODeviceMultiController protected: const char* init() override; - forte::core::io::IOHandle* initHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) override; + forte::core::io::IOHandle* createIOHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) override; void deInit() override; void runLoop() override; diff --git a/src/modules/eliteboard/handler/EliteBoardDeviceController.cpp b/src/modules/eliteboard/handler/EliteBoardDeviceController.cpp index b399323d9..fc0b3c19b 100644 --- a/src/modules/eliteboard/handler/EliteBoardDeviceController.cpp +++ b/src/modules/eliteboard/handler/EliteBoardDeviceController.cpp @@ -22,7 +22,7 @@ EliteBoardDeviceController::EliteBoardDeviceController(CDeviceExecution& paDevic EliteBoardDeviceController::~EliteBoardDeviceController() {} -EliteBoardDeviceController::IOHandle *EliteBoardDeviceController::initHandle(HandleDescriptor &paHandleDescriptor) { +EliteBoardDeviceController::IOHandle *EliteBoardDeviceController::createIOHandle(HandleDescriptor &paHandleDescriptor) { auto desc = static_cast(paHandleDescriptor); IOHandle *handle = new IOHandleGPIO(this, desc.mGPIO_Port, desc.mPin); return static_cast(handle); diff --git a/src/modules/eliteboard/handler/EliteBoardDeviceController.h b/src/modules/eliteboard/handler/EliteBoardDeviceController.h index 39387003c..2ea20f150 100644 --- a/src/modules/eliteboard/handler/EliteBoardDeviceController.h +++ b/src/modules/eliteboard/handler/EliteBoardDeviceController.h @@ -46,7 +46,7 @@ class EliteBoardDeviceController : public forte::core::io::IODeviceController { }; - IOHandle* initHandle(HandleDescriptor& paHandleDescriptor); + IOHandle* createIOHandle(HandleDescriptor& paHandleDescriptor); void setConfig(Config *paConfig) {} const char *init() { diff --git a/src/modules/eliteboard/types/Port.cpp b/src/modules/eliteboard/types/Port.cpp index 7e1705b91..b185e76de 100644 --- a/src/modules/eliteboard/types/Port.cpp +++ b/src/modules/eliteboard/types/Port.cpp @@ -87,7 +87,7 @@ void FORTE_Port::register_handles() { EliteBoardDeviceController::EliteBoardHandleDescriptor descr(id->getValue(), port, 1 << i); auto ctrl = getExtEvHandler(*this); - IOMapper::getInstance().registerHandle(id->getValue(), ctrl.initHandle(descr)); + IOMapper::getInstance().registerHandle(id->getValue(), ctrl.createIOHandle(descr)); } } diff --git a/src/modules/embrick/handler/bus.cpp b/src/modules/embrick/handler/bus.cpp index 1ae35737b..1f391c796 100644 --- a/src/modules/embrick/handler/bus.cpp +++ b/src/modules/embrick/handler/bus.cpp @@ -126,7 +126,7 @@ void EmbrickBusHandler::deInit() { delete mSlaveSelect; } -forte::core::io::IOHandle* EmbrickBusHandler::initHandle( +forte::core::io::IOHandle* EmbrickBusHandler::createIOHandle( forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) { HandleDescriptor &desc = static_cast(paHandleDescriptor); diff --git a/src/modules/embrick/handler/bus.h b/src/modules/embrick/handler/bus.h index fc18c5666..4e5e050da 100644 --- a/src/modules/embrick/handler/bus.h +++ b/src/modules/embrick/handler/bus.h @@ -104,7 +104,7 @@ class EmbrickBusHandler : public forte::core::io::IODeviceMultiController { const char* init(); void deInit(); - forte::core::io::IOHandle* initHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor); + forte::core::io::IOHandle* createIOHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor); void prepareLoop(); virtual void runLoop(); diff --git a/src/modules/wagokbus/modular/wagoDeviceController.cpp b/src/modules/wagokbus/modular/wagoDeviceController.cpp index 706554f57..617d8b2ba 100644 --- a/src/modules/wagokbus/modular/wagoDeviceController.cpp +++ b/src/modules/wagokbus/modular/wagoDeviceController.cpp @@ -84,7 +84,7 @@ const char* WagoDeviceController::init() { return 0; } -forte::core::io::IOHandle* WagoDeviceController::initHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) { +forte::core::io::IOHandle* WagoDeviceController::createIOHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) { WagoHandleDescriptor &desc = *static_cast(paHandleDescriptor); TForteUInt32 outputOffset; diff --git a/src/modules/wagokbus/modular/wagoDeviceController.h b/src/modules/wagokbus/modular/wagoDeviceController.h index 8792f4eae..ef79c0123 100644 --- a/src/modules/wagokbus/modular/wagoDeviceController.h +++ b/src/modules/wagokbus/modular/wagoDeviceController.h @@ -52,7 +52,7 @@ class WagoDeviceController : public forte::core::io::IODeviceMultiController { protected: const char* init(); - forte::core::io::IOHandle* initHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) override; + forte::core::io::IOHandle* createIOHandle(forte::core::io::IODeviceController::HandleDescriptor &paHandleDescriptor) override; void deInit() override;