fix(GMS): Update include sort

* Fix Typo in Identifier
umati · Jul 10, 2023 · 960bf8f · 960bf8f
1 parent 7880088
commit 960bf8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -213,7 +213,7 @@ ua_generate_nodeset_and_datatypes(
     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/TypeDefinition/GMS/CorrectionType.hpp b/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)),