Skip to content

Fix: show correct opta model variant in OPC/UA field "ModelName". #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2024
Merged

Fix: show correct opta model variant in OPC/UA field "ModelName". #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/opcua_server/opcua_server.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ void setup()
UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Arduino Opta Variant: %s", opcua::ArduinoOptaVariant::toString(opta_type).c_str());

/* Define the Arduino Opta as a OPC/UA object. */
arduino_opta_opcua = opcua::ArduinoOpta::create(opc_ua_server);
arduino_opta_opcua = opcua::ArduinoOpta::create(opc_ua_server, opta_type);
if (!arduino_opta_opcua) {
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "opcua::ArduinoOpta::create(...) failed");
return;
Expand Down
4 changes: 2 additions & 2 deletions src/ArduinoOpta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ ArduinoOpta::ArduinoOpta(UA_Server * server, UA_NodeId const & node_id)
* PUBLIC MEMBER FUNCTIONS
**************************************************************************************/

ArduinoOpta::SharedPtr ArduinoOpta::create(UA_Server * server)
ArduinoOpta::SharedPtr ArduinoOpta::create(UA_Server * server, ArduinoOptaVariant::Type const opta_type)
{
UA_StatusCode rc = UA_STATUSCODE_GOOD;

Expand Down Expand Up @@ -103,7 +103,7 @@ ArduinoOpta::SharedPtr ArduinoOpta::create(UA_Server * server)
}

UA_VariableAttributes modelAttr = UA_VariableAttributes_default;
UA_String modelName = UA_STRING("Arduino Opta WiFi");
UA_String modelName = UA_STRING((char *)ArduinoOptaVariant::toString(opta_type).c_str());
UA_Variant_setScalar(&modelAttr.value, &modelName, &UA_TYPES[UA_TYPES_STRING]);
modelAttr.displayName = UA_LOCALIZEDTEXT("en-US", "ModelName");
rc = UA_Server_addVariableNode(server,
Expand Down
3 changes: 2 additions & 1 deletion src/ArduinoOpta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "AnalogInputManager.h"
#include "DigitalInputManager.h"
#include "UserButton.h"
#include "ArduinoOptaVariant.h"

/**************************************************************************************
* NAMESPACE
Expand All @@ -39,7 +40,7 @@ class ArduinoOpta
public:
typedef std::shared_ptr<ArduinoOpta> SharedPtr;

static SharedPtr create(UA_Server * server);
static SharedPtr create(UA_Server * server, ArduinoOptaVariant::Type const opta_type);

ArduinoOpta(UA_Server * server, UA_NodeId const & node_id);

Expand Down