Use polymorphism to obtain the correct SKU number for OPC UA.

Author: aentinger

src/expansion/AnalogExpansion.cpp

@@ -28,9 +28,8 @@ AnalogExpansion::AnalogExpansion(
   UA_Server * server,
   UA_NodeId const parent_node_id,
   char * display_name,
-  char * node_name,
-  char * model_name)
-  : Expansion(server, parent_node_id, display_name, node_name, model_name)
+  char * node_name)
+  : Expansion(server, parent_node_id, display_name, node_name, (char *)toSKUString().c_str())
   , _analog_input_mgr{opcua::AnalogInputManager::create(_server, _node_id)}
   , _analog_output_mgr{opcua::AnalogOutputManager::create(_server, _node_id)}
   , _pwm_output_mgr{opcua::PwmOutputManager::create(_server, _node_id)}
@@ -62,9 +61,7 @@ AnalogExpansion::create(
   char node_name[32] = {0};
   snprintf(node_name, sizeof(node_name), "AnaExp_%d", exp_num);
 
-  char model_name[] = {"AFX00007"};
-
-  auto const instance_ptr = std::make_shared<AnalogExpansion>(server, parent_node_id, display_name, node_name, model_name);
+  auto const instance_ptr = std::make_shared<AnalogExpansion>(server, parent_node_id, display_name, node_name);
   return instance_ptr;
 }
 

src/expansion/AnalogExpansion.h

@@ -50,10 +50,16 @@ class AnalogExpansion : public Expansion
     UA_Server * server,
     UA_NodeId const parent_node_id,
     char * display_name,
-    char * node_name,
-    char * model_name);
+    char * node_name);
+  virtual ~AnalogExpansion() = default;
 
 
+  virtual std::string
+  toSKUString() const override final
+  {
+    return std::string("AFX00007");
+  }
+
   void
   add_analog_input(
     UA_Server * server,

src/expansion/DigitalExpansion.h

@@ -44,7 +44,7 @@ class DigitalExpansion : public Expansion
     char * display_name,
     char * node_name,
     char * model_name);
-
+  virtual ~DigitalExpansion() = default;
 
   void
   add_analog_input(

src/expansion/DigitalMechExpansion.h

@@ -44,9 +44,7 @@ class DigitalMechExpansion : public DigitalExpansion
     char node_name[32] = {0};
     snprintf(node_name, sizeof(node_name), "DigExpSoli_%d", exp_num);
 
-    char model_name[] = {"AFX00005"};
-
-    auto const instance_ptr = std::make_shared<DigitalMechExpansion>(server, parent_node_id, display_name, node_name, model_name);
+    auto const instance_ptr = std::make_shared<DigitalMechExpansion>(server, parent_node_id, display_name, node_name);
     return instance_ptr;
   }
 
@@ -55,10 +53,17 @@ class DigitalMechExpansion : public DigitalExpansion
     UA_Server * server,
     UA_NodeId const parent_node_id,
     char * display_name,
-    char * node_name,
-    char * model_name)
-    : DigitalExpansion{server, parent_node_id, display_name, node_name, model_name}
+    char * node_name)
+    : DigitalExpansion(server, parent_node_id, display_name, node_name, (char *)toSKUString().c_str())
   {}
+  virtual ~DigitalMechExpansion() = default;
+
+
+  virtual std::string
+  toSKUString() const override final
+  {
+    return std::string("AFX00005");
+  }
 };
 
 /**************************************************************************************

src/expansion/DigitalStSolidExpansion.h

@@ -44,9 +44,7 @@ class DigitalStSolidExpansion : public DigitalExpansion
     char node_name[32] = {0};
     snprintf(node_name, sizeof(node_name), "DigExpSoli_%d", exp_num);
 
-    char model_name[] = {"AFX00006"};
-
-    auto const instance_ptr = std::make_shared<DigitalStSolidExpansion>(server, parent_node_id, display_name, node_name, model_name);
+    auto const instance_ptr = std::make_shared<DigitalStSolidExpansion>(server, parent_node_id, display_name, node_name);
     return instance_ptr;
   }
 
@@ -55,10 +53,17 @@ class DigitalStSolidExpansion : public DigitalExpansion
     UA_Server * server,
     UA_NodeId const parent_node_id,
     char * display_name,
-    char * node_name,
-    char * model_name)
-    : DigitalExpansion{server, parent_node_id, display_name, node_name, model_name}
+    char * node_name)
+    : DigitalExpansion{server, parent_node_id, display_name, node_name, (char *)toSKUString().c_str()}
   {}
+  virtual ~DigitalStSolidExpansion() = default;
+
+
+  virtual std::string
+  toSKUString() const override final
+  {
+    return std::string("AFX00006");
+  }
 };
 
 /**************************************************************************************

src/expansion/Expansion.h

@@ -40,6 +40,10 @@ class Expansion
     char * display_name,
     char * node_name,
     char * model_name);
+  virtual ~Expansion() = default;
+
+  virtual std::string
+  toSKUString() const = 0;
 
 
 protected: