chore(deps): update deps/open62541 digest to 258d6ad (#1080)

* chore(deps): update deps/open62541 digest to 7ca9cfb * fix(deps): Update MachineryNodeIds to new name * fix(deps): Change to GMS release version * fix(deps): Bump Machinery/Result to release * fix(GMS): Update include sort * Fix Typo in Identifier * fix: Adjustments to GMS Result * refactor: Linting --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Götz Görisch <[email protected]> Co-authored-by: Christian von Arnim <[email protected]>
umati · Aug 4, 2023 · a94b2f2 · a94b2f2
1 parent 36558ca
commit a94b2f2
Show file tree

Hide file tree

Showing 24 changed files with 62 additions and 6,593 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,11 +37,13 @@ jobs:
           echo "CMAKE_GENERATOR=Visual Studio 17 2022">> "$env:GITHUB_ENV"
           echo "ARG_CTEST=-C Debug">> "$env:GITHUB_ENV"
       - name: Build server with dependencies
+        # yamllint disable rule:line-length
         run: |
           mkdir -p build
           cd build
           cmake ../Sample-Server/.github/ -DCMAKE_INSTALL_PREFIX:PATH=${{ env.CMAKE_INSTALL_PREFIX }}
           cmake --build .
+        # yamllint enable rule:line-length
       - name: Upload Artefacts
         uses: actions/upload-artifact@v3
         with:
@@ -70,10 +72,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/[email protected]
       - name: PrepareReg Names
+        # yamllint disable rule:line-length
         run: |
           echo IMAGE_REPOSITORY="$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV"
           echo IMAGE_TAG="$(echo "${{ github.ref }}" | tr '[:upper:]' '[:lower:]' |  awk '{sub(/([^\/]*\/){2}/,""); gsub(/\/|_/, "-")}1')" >> "$GITHUB_ENV"
           echo IS_NOT_PR="${{ env.IS_NOT_PR }})"
+        # yamllint enable rule:line-length
       - name: Login to GitHub Container Registry
         uses: docker/[email protected]
         if: env.IS_NOT_PR == 'true' && ${{ github.actor }} != 'dependabot'

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,7 +74,7 @@ configure_file(cmake/empty.bsd.template "${CMAKE_BINARY_DIR}/model/Opc.Ua.Machin
 ua_generate_nodeset_and_datatypes(
     NAME "machinery"
     FILE_NS "${UA_NODESET_DIR}/Machinery/Opc.Ua.Machinery.NodeSet2.xml"
-    FILE_CSV "${UA_NODESET_DIR}/Machinery/NodeIds.csv"
+    FILE_CSV "${UA_NODESET_DIR}/Machinery/Opc.Ua.Machinery.NodeIds.csv"
     FILE_BSD "${CMAKE_BINARY_DIR}/model/Opc.Ua.Machinery.Types.bsd"
     NAMESPACE_MAP "3:http://opcfoundation.org/UA/Machinery/"
     TARGET_PREFIX "${PROJECT_NAME}"
@@ -185,9 +185,9 @@ target_link_libraries(ua_gen_woodworking PUBLIC ua_gen_machinery)
 
 ua_generate_nodeset_and_datatypes(
     NAME "machinery_result"
-    FILE_NS "${PROJECT_SOURCE_DIR}/model/GMS/Opc.Ua.MachineryResult.NodeSet2.xml"
-    FILE_CSV "${PROJECT_SOURCE_DIR}/model/GMS/Opc.Ua.MachineryResult.NodeSet2.csv"
-    FILE_BSD "${PROJECT_SOURCE_DIR}/model/GMS/Opc.Ua.MachineryResult.NodeSet2.bsd"
+    FILE_NS "${UA_NODESET_DIR}/Machinery/Result/Opc.Ua.Machinery.Result.NodeSet2.xml"
+    FILE_CSV "${UA_NODESET_DIR}/Machinery/Result/NodeIds.csv"
+    FILE_BSD "${PROJECT_SOURCE_DIR}/model/MachineryResult/Opc.Ua.Machinery.Result.NodeSet2.bsd"
     NAMESPACE_MAP "7:http://opcfoundation.org/UA/Machinery/Result/"
     TARGET_PREFIX "${PROJECT_NAME}"
     OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
@@ -207,13 +207,13 @@ target_link_libraries(ua_gen_machinery_result PUBLIC open62541::open62541)
 
 ua_generate_nodeset_and_datatypes(
     NAME "gms"
-    FILE_NS "${PROJECT_SOURCE_DIR}/model/GMS/opc.ua.gms.nodeset2.xml"
-    FILE_CSV "${PROJECT_SOURCE_DIR}/model/GMS/opc.ua.gms.nodeset2.csv"
-    FILE_BSD "${PROJECT_SOURCE_DIR}/model/GMS/opc.ua.gms.nodeset2.bsd"
-    NAMESPACE_MAP "8:http://opcfoundation.org/GMS/"
+    FILE_NS "${UA_NODESET_DIR}/GMS/opc.ua.gms.nodeset2.xml"
+    FILE_CSV "${UA_NODESET_DIR}/GMS/opc.ua.gms.nodesids.csv"
+    FILE_BSD "${UA_NODESET_DIR}/GMS/opc.ua.gms.types.bsd"
+    NAMESPACE_MAP "8:http://opcfoundation.org/UA/GMS/"
     TARGET_PREFIX "${PROJECT_NAME}"
     OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
-    DEPENDS di ia machinery machinery_result machinetool
+    DEPENDS di ia machinery_result machinetool machinery
 )
 
 add_library(ua_gen_gms)
@@ -248,7 +248,7 @@ ua_generate_nodeset_and_datatypes(
     FILE_NS "${UA_NODESET_DIR}/PADIM/Opc.Ua.PADIM.NodeSet2.xml"
     FILE_CSV "${UA_NODESET_DIR}/PADIM/Opc.Ua.PADIM.NodeIds.csv"
     FILE_BSD "${CMAKE_BINARY_DIR}/model/Opc.Ua.PADIM.Types.bsd"
-    NAMESPACE_MAP "6:http://opcfoundation.org/UA/PADIM/"
+    NAMESPACE_MAP "10:http://opcfoundation.org/UA/PADIM/"
     TARGET_PREFIX "${PROJECT_NAME}"
     OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
     DEPENDS di irdi
@@ -284,7 +284,7 @@ ua_generate_nodeset_and_datatypes(
     FILE_NS "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.xml"
     FILE_CSV "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.csv"
     FILE_BSD "${PROJECT_SOURCE_DIR}/model/AdditiveManufacturing/Opc.Ua.AdditiveManufacturing.NodeSet2.bsd"
-    NAMESPACE_MAP "8:http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/"
+    NAMESPACE_MAP "12:http://opcfoundation.org/UA/AdditiveManufacturing/NodeSet2/"
     TARGET_PREFIX "${PROJECT_NAME}"
     OUTPUT_DIR "${SAMPLESERVER_GENERATED_NODESET_AND_DATATYPES_OUTPUT_DIR}"
     DEPENDS di

diff --git a/GMS/BasicGMS.cpp b/GMS/BasicGMS.cpp
@@ -92,9 +92,9 @@ void BasicGMS::InstantiateResultManagement() {
   initCorrection(corr3, "corr3", "c_456", 0.75);
 }
 
-void BasicGMS::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value) {
+void BasicGMS::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value) {
   corr.Identifier = Identifier;
-  corr.CharacteristicIdentfier = CharacteristicIdentfier;
+  corr.CharacteristicIdentifier = CharacteristicIdentifier;
   InstantiateOptional(corr.CorrectionValueAbsolute, m_pServer, n);
   corr.CorrectionValueAbsolute->Value = value;
   corr.CorrectionValueAbsolute->EngineeringUnits.value.DisplayName.text = "µm";

diff --git a/GMS/BasicGMS.hpp b/GMS/BasicGMS.hpp
@@ -27,7 +27,7 @@ class BasicGMS : public InstantiatedMachineTool {
   void InstantiateTools();
   int m_simStep = 0;
 
-  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
+  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);
 
   void InstantiateResultManagement();
 };
diff --git a/GMS/FullGMS.cpp b/GMS/FullGMS.cpp
@@ -113,7 +113,8 @@ void FullGMS::InstantiateEquipment() {
   sensor1.Axes->push_back("Y");
 
   InstantiateOptional(sensor1.Capabilities, m_pServer, n);
-  sensor1.Capabilities->push_back(UA_ToolCapabilities::UA_TOOLCAPABILITIES_PTMEAS);
+  /// \todo Must be updated to release specification
+  // sensor1.Capabilities->push_back(UA_ToolCapabilities::UA_TOOLCAPABILITIES_PTMEAS);
 
   InstantiateOptional(sensor1.IsQualifiedStatus, m_pServer, n);
   sensor1.IsQualifiedStatus = UA_ToolIsQualifiedStatus::UA_TOOLISQUALIFIEDSTATUS_QUALIFIED;

diff --git a/GMS/HexagonGlobal.hpp b/GMS/HexagonGlobal.hpp
@@ -27,7 +27,7 @@ class HexagonGlobal : public InstantiatedMachineTool {
   void InstantiateTools();
   int m_simStep = 0;
 
-  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
+  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);
 
   void InstantiateResultManagement();
 };
diff --git a/GMS/HexagonSim.hpp b/GMS/HexagonSim.hpp
@@ -27,7 +27,7 @@ class HexagonSim : public InstantiatedMachineTool {
   void InstantiateTools();
   int m_simStep = 0;
 
-  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
+  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);
 
   void InstantiateResultManagement();
 };
diff --git a/GMS/OGPSmartScopeCNC500.cpp b/GMS/OGPSmartScopeCNC500.cpp
@@ -92,9 +92,9 @@ void OGPSmartScopeCNC500::InstantiateResultManagement() {
   initCorrection(corr3, "corr3", "c_456", 0.75);
 }
 
-void OGPSmartScopeCNC500::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value) {
+void OGPSmartScopeCNC500::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value) {
   corr.Identifier = Identifier;
-  corr.CharacteristicIdentfier = CharacteristicIdentfier;
+  corr.CharacteristicIdentifier = CharacteristicIdentifier;
   InstantiateOptional(corr.CorrectionValueAbsolute, m_pServer, n);
   corr.CorrectionValueAbsolute->Value = value;
   corr.CorrectionValueAbsolute->EngineeringUnits.value.DisplayName.text = "µm";

diff --git a/GMS/OGPSmartScopeCNC500.hpp b/GMS/OGPSmartScopeCNC500.hpp
@@ -27,7 +27,7 @@ class OGPSmartScopeCNC500 : public InstantiatedMachineTool {
   void InstantiateTools();
   int m_simStep = 0;
 
-  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
+  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);
 
   void InstantiateResultManagement();
 };
diff --git a/GMS/WenzelLH.cpp b/GMS/WenzelLH.cpp
@@ -92,9 +92,9 @@ void WenzelLH::InstantiateResultManagement() {
   initCorrection(corr3, "corr3", "c_456", 0.75);
 }
 
-void WenzelLH::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value) {
+void WenzelLH::initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value) {
   corr.Identifier = Identifier;
-  corr.CharacteristicIdentfier = CharacteristicIdentfier;
+  corr.CharacteristicIdentifier = CharacteristicIdentifier;
   InstantiateOptional(corr.CorrectionValueAbsolute, m_pServer, n);
   corr.CorrectionValueAbsolute->Value = value;
   corr.CorrectionValueAbsolute->EngineeringUnits.value.DisplayName.text = "µm";

diff --git a/GMS/WenzelLH.hpp b/GMS/WenzelLH.hpp
@@ -27,7 +27,7 @@ class WenzelLH : public InstantiatedMachineTool {
   void InstantiateTools();
   int m_simStep = 0;
 
-  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentfier, double value);
+  void initCorrection(GMS::CorrectionType_t &corr, std::string Identifier, std::string CharacteristicIdentifier, double value);
 
   void InstantiateResultManagement();
 };
diff --git a/SampleServer.cpp b/SampleServer.cpp
@@ -127,7 +127,7 @@ UA_StatusCode setServerConfig(UA_ServerConfig *pConfig, const Configuration::Con
   pConfig->applicationDescription.productUri = UA_STRING_ALLOC("https://github.com/umati/Sample-Server/");
 
   // Do not limit clients
-  UA_CertificateVerification_AcceptAll(&pConfig->certificateVerification);
+  UA_CertificateVerification_AcceptAll(&pConfig->secureChannelPKI);
   // Use Default sizes
   std::vector<std::string> serverUrls;
   {
@@ -160,7 +160,7 @@ UA_StatusCode setServerConfig(UA_ServerConfig *pConfig, const Configuration::Con
     }
   }
   status = UA_AccessControl_default(
-    pConfig, true, NULL, &pConfig->securityPolicies[pConfig->securityPoliciesSize - 1].policyUri, users.size(), users.size() == 0 ? nullptr : &users[0]);
+    pConfig, true, &pConfig->securityPolicies[pConfig->securityPoliciesSize - 1].policyUri, users.size(), users.size() == 0 ? nullptr : &users[0]);
   if (status != UA_STATUSCODE_GOOD) {
     return status;
   }

diff --git a/TypeDefinition/GMS/Constants.hpp b/TypeDefinition/GMS/Constants.hpp
@@ -10,5 +10,5 @@
 #include "../../src_generated/types_gms_generated.h"
 
 namespace constants {
-constexpr const char *NsGMSUri = "http://opcfoundation.org/GMS/";
+constexpr const char *NsGMSUri = "http://opcfoundation.org/UA/GMS/";
 }
diff --git a/TypeDefinition/GMS/CorrectionType.hpp b/TypeDefinition/GMS/CorrectionType.hpp
@@ -12,7 +12,7 @@
 
 namespace GMS {
 struct CorrectionType_t {
-  BindableMemberValue<std::string> CharacteristicIdentfier;
+  BindableMemberValue<std::string> CharacteristicIdentifier;
   BindableMember<ns0::AnalogUnitType_t<double>> CorrectionValueAbsolute;
   BindableMember<ns0::AnalogUnitType_t<double>> CorrectionValueRelative;
   BindableMemberValue<std::string> Description;
@@ -24,8 +24,8 @@ struct CorrectionType_t {
 
 REFL_TYPE(GMS::CorrectionType_t, UmatiServerLib::attribute::UaObjectType(UmatiServerLib::constexp::NodeId(constants::NsGMSUri, UA_GMSID_CORRECTIONTYPE)))
 REFL_FIELD(
-  CharacteristicIdentfier,
-  UmatiServerLib::attribute::MemberInTypeNodeId(UmatiServerLib::constexp::NodeId(constants::NsGMSUri, UA_GMSID_CORRECTIONTYPE_CHARACTERISTICIDENTFIER)))
+  CharacteristicIdentifier,
+  UmatiServerLib::attribute::MemberInTypeNodeId(UmatiServerLib::constexp::NodeId(constants::NsGMSUri, UA_GMSID_CORRECTIONTYPE_CHARACTERISTICIDENTIFIER)))
 REFL_FIELD(
   CorrectionValueAbsolute,
   UmatiServerLib::attribute::MemberInTypeNodeId(UmatiServerLib::constexp::NodeId(constants::NsGMSUri, UA_GMSID_CORRECTIONTYPE_CORRECTIONVALUEABSOLUTE)),

diff --git a/TypeDefinition/GMS/WorkspaceType.hpp b/TypeDefinition/GMS/WorkspaceType.hpp
@@ -26,9 +26,23 @@ struct CylindricalWorkspaceType_t : public WorkspaceType_t {
   BindableMemberValue<UA_Double> Radius;
 };
 
+namespace internalTypes {
+
+static const UA_DataType UA_WorkspaceType = {
+  UA_TYPENAME("WorkspaceType")        /* .typeName */
+  {0, UA_NODEIDTYPE_NUMERIC, {3006}}, /* .typeId */
+  {0, UA_NODEIDTYPE_NUMERIC, {0}},    /* .binaryEncodingId, the numericidentifier used on the wire (thenamespaceindex is from .typeId) */
+  0,                                  /* .memSize */
+  UA_DATATYPEKIND_STRUCTURE,          /* .typeKind */
+  true,                               /* .pointerFree */
+  false,                              /* .overlayable (depends on endianness and the absence of padding) */
+  0,                                  /* .membersSize */
+  NULL};
+}  // namespace internalTypes
+
 }  // namespace GMS
 
-REFL_TYPE(GMS::WorkspaceType_t, UmatiServerLib::attribute::UaDataType(&UA_TYPES_GMS[UA_TYPES_GMS_WORKSPACETYPE]))
+REFL_TYPE(GMS::WorkspaceType_t, UmatiServerLib::attribute::UaDataType(&GMS::internalTypes::UA_WorkspaceType))
 REFL_END
 
 REFL_TYPE(

diff --git a/deps/open62541 b/deps/open62541