From 617a0abcf0091c60ea9cde6671147c3a9f57c328 Mon Sep 17 00:00:00 2001
From: Alexander Entinger <consulting@lxrobotics.com>
Date: Thu, 13 Jun 2024 12:42:54 +0200
Subject: [PATCH] Fix: only create aggregate OPC/UA objects (Relays, LEDs, ...)
 when there is at least one such node.

---
 src/ArduinoOpta.cpp | 80 +++++++++++++++++++++++++++++++--------------
 src/ArduinoOpta.h   | 10 +++---
 2 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/src/ArduinoOpta.cpp b/src/ArduinoOpta.cpp
index cbd6d36..236ca99 100644
--- a/src/ArduinoOpta.cpp
+++ b/src/ArduinoOpta.cpp
@@ -25,32 +25,16 @@ namespace opcua
  **************************************************************************************/
 
 ArduinoOpta::ArduinoOpta(UA_Server * server, UA_NodeId const & node_id)
-: _node_id{node_id}
+: _server{server}
+, _node_id{node_id}
+, _analog_input_mgr{nullptr}
+, _digital_input_mgr{nullptr}
+, _relay_mgr{nullptr}
+, _led_mgr{nullptr}
 {
-  _usr_button = opcua::UserButton::create(server, _node_id);
-  if (!_usr_button) {
+  _usr_button = opcua::UserButton::create(_server, _node_id);
+  if (!_usr_button)
     UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::Ctor: UserButton::create(...) failed.");
-  }
-
-  _analog_input_mgr = opcua::AnalogInputManager::create(server, _node_id);
-  if (!_analog_input_mgr) {
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::Ctor: AnalogInputManager::create(...) failed.");
-  }
-
-  _digital_input_mgr = opcua::DigitalInputManager::create(server, _node_id);
-  if (!_digital_input_mgr) {
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::Ctor: DigitalInputManager::create(...) failed.");
-  }
-
-  _relay_mgr = opcua::RelayManager::create(server, _node_id);
-  if (!_relay_mgr) {
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::Ctor: RelayManager::create(...) failed.");
-  }
-
-  _led_mgr = opcua::LedManager::create(server, _node_id);
-  if (!_led_mgr) {
-    UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::Ctor: LedManager::create(...) failed.");
-  }
 }
 
 /**************************************************************************************
@@ -148,6 +132,54 @@ ArduinoOpta::SharedPtr ArduinoOpta::create(UA_Server * server, ArduinoOptaVarian
   return instance_ptr;
 }
 
+AnalogInputManager::SharedPtr ArduinoOpta::analog_input_mgr()
+{
+  if (!_analog_input_mgr)
+  {
+    _analog_input_mgr = opcua::AnalogInputManager::create(_server, _node_id);
+    if (!_analog_input_mgr)
+      UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::analog_input_mgr: AnalogInputManager::create(...) failed.");
+  }
+
+  return _analog_input_mgr;
+}
+
+DigitalInputManager::SharedPtr ArduinoOpta::digital_input_mgr()
+{
+  if (!_digital_input_mgr)
+  {
+    _digital_input_mgr = opcua::DigitalInputManager::create(_server, _node_id);
+    if (!_digital_input_mgr)
+      UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::digital_input_mgr: DigitalInputManager::create(...) failed.");
+  }
+
+  return _digital_input_mgr;
+}
+
+RelayManager::SharedPtr ArduinoOpta::relay_mgr()
+{
+  if (!_relay_mgr)
+  {
+    _relay_mgr = opcua::RelayManager::create(_server, _node_id);
+    if (!_relay_mgr)
+      UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::relay_mgr: RelayManager::create(...) failed.");
+  }
+
+  return _relay_mgr;
+}
+
+LedManager::SharedPtr ArduinoOpta::led_mgr()
+{
+  if (!_led_mgr)
+  {
+    _led_mgr = opcua::LedManager::create(_server, _node_id);
+    if (!_led_mgr)
+      UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "ArduinoOpta::led_mgr: LedManager::create(...) failed.");
+  }
+
+  return _led_mgr;
+}
+
 /**************************************************************************************
  * NAMESPACE
  **************************************************************************************/
diff --git a/src/ArduinoOpta.h b/src/ArduinoOpta.h
index 4a73223..21710c8 100644
--- a/src/ArduinoOpta.h
+++ b/src/ArduinoOpta.h
@@ -44,14 +44,16 @@ class ArduinoOpta
 
   ArduinoOpta(UA_Server * server, UA_NodeId const & node_id);
 
-  inline AnalogInputManager::SharedPtr analog_input_mgr() const { return _analog_input_mgr; }
-  inline DigitalInputManager::SharedPtr digital_input_mgr() const { return _digital_input_mgr; }
-  inline RelayManager::SharedPtr relay_mgr() const { return _relay_mgr; }
-  inline LedManager::SharedPtr led_mgr() const { return _led_mgr; }
+  AnalogInputManager::SharedPtr  analog_input_mgr();
+  DigitalInputManager::SharedPtr digital_input_mgr();
+  RelayManager::SharedPtr        relay_mgr();
+  LedManager::SharedPtr          led_mgr();
 
 
 private:
+  UA_Server * _server;
   UA_NodeId _node_id;
+
   UserButton::SharedPtr _usr_button;
   AnalogInputManager::SharedPtr _analog_input_mgr;
   DigitalInputManager::SharedPtr _digital_input_mgr;