feat(GMS): Update to GMS Release v1.0.0

.gitpod.yml

@@ -22,7 +22,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-image: gitpod/workspace-full:2023-03-24-22-45-37
+# hadolint ignore=DL3007
+image: gitpod/workspace-full:latest
 
 tasks:
   - init: npm install --location=global opcua-commander && sudo apt update && sudo apt -yy install yamllint && pip install cmakelang

CMakeLists.txt

@@ -1,11 +1,11 @@
 # MIT License
 #
-# Copyright 2020-2021 (c) Christian von Arnim, ISW University of Stuttgart (for umati and VDW e.V.)
-# Copyright 2021 (c) Götz Görisch, VDW - Verein Deutscher Werkzeugmaschinenfabriken e.V.
-# Copyright 2021 (c) Dennis Hezel, 3Yourmind GmbH
-# Copyright 2021 (c) Hermann Leinweber, basysKom GmbH
-# Copyright 2022 (c) Sebastian Friedl, ISW University of Stuttgart (for umati and VDMA e.V.)
-# Copyright 2022 (c) Patrick Moeller, 3Yourmind GmbH
+# Copyright (c) 2020-2021 Christian von Arnim, ISW University of Stuttgart (for umati and VDW e.V.)
+# Copyright (c) 2021-2023 Götz Görisch, VDW - Verein Deutscher Werkzeugmaschinenfabriken e.V.
+# Copyright (c) 2021 Dennis Hezel, 3Yourmind GmbH
+# Copyright (c) 2021 Hermann Leinweber, basysKom GmbH
+# Copyright (c) 2022 Sebastian Friedl, ISW University of Stuttgart (for umati and VDMA e.V.)
+# Copyright (c) 2022 Patrick Moeller, 3Yourmind GmbH
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
 # SOFTWARE.
 
 cmake_minimum_required(VERSION 3.15)
-project(SampleServer VERSION 1.1.1)
+project(SampleServer VERSION 1.2.0)
 
 set(CMAKE_CXX_STANDARD 20)
 
@@ -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 "${UA_NODESET_DIR}/Machinery/Result/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,10 +207,10 @@ 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
@@ -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

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/";
 }

TypeDefinition/GMS/CorrectionType.hpp

@@ -25,7 +25,7 @@ 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)))
+  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)),