Merge pull request #67 from OPCFoundation/v1.04

UA-1.04.10-2021-09-15

AnsiC/opcua_attributes.h

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 

AnsiC/opcua_clientapi.c

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 

AnsiC/opcua_clientapi.h

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 

AnsiC/opcua_exclusions.h

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -77,6 +77,7 @@
 /*============================================================================
 * DataType Exclusions
  *===========================================================================*/
+/* #define OPCUA_EXCLUDE_Union */
 /* #define OPCUA_EXCLUDE_KeyValuePair */
 /* #define OPCUA_EXCLUDE_AdditionalParametersType */
 /* #define OPCUA_EXCLUDE_EphemeralKeyType */
@@ -143,6 +144,7 @@
 /* #define OPCUA_EXCLUDE_BrokerDataSetWriterTransportDataType */
 /* #define OPCUA_EXCLUDE_BrokerDataSetReaderTransportDataType */
 /* #define OPCUA_EXCLUDE_AliasNameDataType */
+/* #define OPCUA_EXCLUDE_UnsignedRationalNumber */
 /* #define OPCUA_EXCLUDE_RolePermissionType */
 /* #define OPCUA_EXCLUDE_DataTypeDefinition */
 /* #define OPCUA_EXCLUDE_StructureField */
@@ -164,7 +166,6 @@
 /* #define OPCUA_EXCLUDE_EnumValueType */
 /* #define OPCUA_EXCLUDE_EnumField */
 /* #define OPCUA_EXCLUDE_OptionSet */
-/* #define OPCUA_EXCLUDE_Union */
 /* #define OPCUA_EXCLUDE_TimeZoneDataType */
 /* #define OPCUA_EXCLUDE_ApplicationDescription */
 /* #define OPCUA_EXCLUDE_RequestHeader */

AnsiC/opcua_serverapi.c

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 

AnsiC/opcua_serverapi.h

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 

AnsiC/opcua_statuscodes.h

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -1267,6 +1267,61 @@ OPCUA_BEGIN_EXTERN_C
  *===========================================================================*/
 #define OpcUa_BadMaxConnectionsReached 0x80B70000
 
+/*============================================================================
+ * The value may not be accurate because the transducer is in manual mode.
+ *===========================================================================*/
+#define OpcUa_UncertainTransducerInManual 0x42080000
+
+/*============================================================================
+ * The value is simulated.
+ *===========================================================================*/
+#define OpcUa_UncertainSimulatedValue 0x42090000
+
+/*============================================================================
+ * The value may not be accurate due to a sensor calibration fault.
+ *===========================================================================*/
+#define OpcUa_UncertainSensorCalibration 0x420A0000
+
+/*============================================================================
+ * The value may not be accurate due to a configuration issue.
+ *===========================================================================*/
+#define OpcUa_UncertainConfigurationError 0x420F0000
+
+/*============================================================================
+ * The value source supports cascade handshaking and the value has been Initialized based on an initialization request from a cascade secondary.
+ *===========================================================================*/
+#define OpcUa_GoodCascadeInitializationAcknowledged 0x04010000
+
+/*============================================================================
+ * The value source supports cascade handshaking and is requesting initialization of a cascade primary.
+ *===========================================================================*/
+#define OpcUa_GoodCascadeInitializationRequest 0x04020000
+
+/*============================================================================
+ * The value source supports cascade handshaking, however, the source’s current state does not allow for cascade.
+ *===========================================================================*/
+#define OpcUa_GoodCascadeNotInvited 0x04030000
+
+/*============================================================================
+ * The value source supports cascade handshaking, however, the source has not selected the corresponding cascade primary for use.
+ *===========================================================================*/
+#define OpcUa_GoodCascadeNotSelected 0x04040000
+
+/*============================================================================
+ * There is a fault state condition active in the value source.
+ *===========================================================================*/
+#define OpcUa_GoodFaultStateActive 0x04070000
+
+/*============================================================================
+ * A fault state condition is being requested of the destination.
+ *===========================================================================*/
+#define OpcUa_GoodInitiateFaultState 0x04080000
+
+/*============================================================================
+ * The value is accurate, and the signal source supports cascade handshaking.
+ *===========================================================================*/
+#define OpcUa_GoodCascade 0x04090000
+
 OPCUA_END_EXTERN_C
 
 #endif /* _OpcUa_StatusCodes_H_ */

AnsiC/opcua_types.c

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -345,6 +345,8 @@ static struct _OpcUa_EnumeratedValue g_OpcUa_StructureType_EnumeratedValues[] =
     { "Structure", 0 },
     { "StructureWithOptionalFields", 1 },
     { "Union", 2 },
+    { "StructureWithSubtypedValues", 3 },
+    { "UnionWithSubtypedValues", 4 },
     { OpcUa_Null, 0 }
 };
 
@@ -29033,7 +29035,7 @@ OpcUa_Void OpcUa_ProgramDiagnostic2DataType_Initialize(OpcUa_ProgramDiagnostic2D
         OpcUa_Field_InitializeArray(Variant, LastMethodInputValues);
         OpcUa_Field_InitializeArray(Variant, LastMethodOutputValues);
         OpcUa_Field_Initialize(DateTime, LastMethodCallTime);
-        OpcUa_Field_InitializeEncodeable(OpcUa_StatusResult, LastMethodReturnStatus);
+        OpcUa_Field_Initialize(StatusCode, LastMethodReturnStatus);
     }
 }
 
@@ -29055,7 +29057,7 @@ OpcUa_Void OpcUa_ProgramDiagnostic2DataType_Clear(OpcUa_ProgramDiagnostic2DataTy
         OpcUa_Field_ClearArray(Variant, LastMethodInputValues);
         OpcUa_Field_ClearArray(Variant, LastMethodOutputValues);
         OpcUa_Field_Clear(DateTime, LastMethodCallTime);
-        OpcUa_Field_ClearEncodeable(OpcUa_StatusResult, LastMethodReturnStatus);
+        OpcUa_Field_Clear(StatusCode, LastMethodReturnStatus);
     }
 }
 
@@ -29085,7 +29087,7 @@ OpcUa_StatusCode OpcUa_ProgramDiagnostic2DataType_GetSize(OpcUa_ProgramDiagnosti
     OpcUa_Field_GetSizeArray(Variant, LastMethodInputValues);
     OpcUa_Field_GetSizeArray(Variant, LastMethodOutputValues);
     OpcUa_Field_GetSize(DateTime, LastMethodCallTime);
-    OpcUa_Field_GetSizeEncodeable(OpcUa_StatusResult, LastMethodReturnStatus);
+    OpcUa_Field_GetSize(StatusCode, LastMethodReturnStatus);
 
     *a_pSize = iSize;
 
@@ -29118,7 +29120,7 @@ OpcUa_StatusCode OpcUa_ProgramDiagnostic2DataType_Encode(OpcUa_ProgramDiagnostic
     OpcUa_Field_WriteArray(Variant, LastMethodInputValues);
     OpcUa_Field_WriteArray(Variant, LastMethodOutputValues);
     OpcUa_Field_Write(DateTime, LastMethodCallTime);
-    OpcUa_Field_WriteEncodeable(OpcUa_StatusResult, LastMethodReturnStatus);
+    OpcUa_Field_Write(StatusCode, LastMethodReturnStatus);
 
     OpcUa_ReturnStatusCode;
     OpcUa_BeginErrorHandling;
@@ -29151,7 +29153,7 @@ OpcUa_StatusCode OpcUa_ProgramDiagnostic2DataType_Decode(OpcUa_ProgramDiagnostic
     OpcUa_Field_ReadArray(Variant, LastMethodInputValues);
     OpcUa_Field_ReadArray(Variant, LastMethodOutputValues);
     OpcUa_Field_Read(DateTime, LastMethodCallTime);
-    OpcUa_Field_ReadEncodeable(OpcUa_StatusResult, LastMethodReturnStatus);
+    OpcUa_Field_Read(StatusCode, LastMethodReturnStatus);
 
     OpcUa_ReturnStatusCode;
     OpcUa_BeginErrorHandling;

AnsiC/opcua_types.h

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Copyright (c) 2005-2020 The OPC Foundation, Inc. All rights reserved.
+ * Copyright (c) 2005-2021 The OPC Foundation, Inc. All rights reserved.
  *
  * OPC Foundation MIT License 1.00
  * 
@@ -264,7 +264,9 @@ typedef enum _OpcUa_StructureType
 {
     OpcUa_StructureType_Structure                   = 0,
     OpcUa_StructureType_StructureWithOptionalFields = 1,
-    OpcUa_StructureType_Union                       = 2
+    OpcUa_StructureType_Union                       = 2,
+    OpcUa_StructureType_StructureWithSubtypedValues = 3,
+    OpcUa_StructureType_UnionWithSubtypedValues     = 4
 #if OPCUA_FORCE_INT32_ENUMS
     ,_OpcUa_StructureType_MaxEnumerationValue = OpcUa_Int32_Max
 #endif
@@ -6872,22 +6874,22 @@ OPCUA_IMEXPORT extern struct _OpcUa_EncodeableType OpcUa_ProgramDiagnosticDataTy
  *===========================================================================*/
 typedef struct _OpcUa_ProgramDiagnostic2DataType
 {
-    OpcUa_NodeId       CreateSessionId;
-    OpcUa_String       CreateClientName;
-    OpcUa_DateTime     InvocationCreationTime;
-    OpcUa_DateTime     LastTransitionTime;
-    OpcUa_String       LastMethodCall;
-    OpcUa_NodeId       LastMethodSessionId;
-    OpcUa_Int32        NoOfLastMethodInputArguments;
-    OpcUa_Argument*    LastMethodInputArguments;
-    OpcUa_Int32        NoOfLastMethodOutputArguments;
-    OpcUa_Argument*    LastMethodOutputArguments;
-    OpcUa_Int32        NoOfLastMethodInputValues;
-    OpcUa_Variant*     LastMethodInputValues;
-    OpcUa_Int32        NoOfLastMethodOutputValues;
-    OpcUa_Variant*     LastMethodOutputValues;
-    OpcUa_DateTime     LastMethodCallTime;
-    OpcUa_StatusResult LastMethodReturnStatus;
+    OpcUa_NodeId     CreateSessionId;
+    OpcUa_String     CreateClientName;
+    OpcUa_DateTime   InvocationCreationTime;
+    OpcUa_DateTime   LastTransitionTime;
+    OpcUa_String     LastMethodCall;
+    OpcUa_NodeId     LastMethodSessionId;
+    OpcUa_Int32      NoOfLastMethodInputArguments;
+    OpcUa_Argument*  LastMethodInputArguments;
+    OpcUa_Int32      NoOfLastMethodOutputArguments;
+    OpcUa_Argument*  LastMethodOutputArguments;
+    OpcUa_Int32      NoOfLastMethodInputValues;
+    OpcUa_Variant*   LastMethodInputValues;
+    OpcUa_Int32      NoOfLastMethodOutputValues;
+    OpcUa_Variant*   LastMethodOutputValues;
+    OpcUa_DateTime   LastMethodCallTime;
+    OpcUa_StatusCode LastMethodReturnStatus;
 }
 OpcUa_ProgramDiagnostic2DataType;
 

DotNet/Opc.Ua.StatusCodes.cs

@@ -1273,5 +1273,60 @@ public static partial class StatusCodes
         /// The operation could not be finished because all available connections are in use.
         /// </summary>
         public const uint BadMaxConnectionsReached = 0x80B70000;
+
+        /// <summary>
+        /// The value may not be accurate because the transducer is in manual mode.
+        /// </summary>
+        public const uint UncertainTransducerInManual = 0x42080000;
+
+        /// <summary>
+        /// The value is simulated.
+        /// </summary>
+        public const uint UncertainSimulatedValue = 0x42090000;
+
+        /// <summary>
+        /// The value may not be accurate due to a sensor calibration fault.
+        /// </summary>
+        public const uint UncertainSensorCalibration = 0x420A0000;
+
+        /// <summary>
+        /// The value may not be accurate due to a configuration issue.
+        /// </summary>
+        public const uint UncertainConfigurationError = 0x420F0000;
+
+        /// <summary>
+        /// The value source supports cascade handshaking and the value has been Initialized based on an initialization request from a cascade secondary.
+        /// </summary>
+        public const uint GoodCascadeInitializationAcknowledged = 0x04010000;
+
+        /// <summary>
+        /// The value source supports cascade handshaking and is requesting initialization of a cascade primary.
+        /// </summary>
+        public const uint GoodCascadeInitializationRequest = 0x04020000;
+
+        /// <summary>
+        /// The value source supports cascade handshaking, however, the source’s current state does not allow for cascade.
+        /// </summary>
+        public const uint GoodCascadeNotInvited = 0x04030000;
+
+        /// <summary>
+        /// The value source supports cascade handshaking, however, the source has not selected the corresponding cascade primary for use.
+        /// </summary>
+        public const uint GoodCascadeNotSelected = 0x04040000;
+
+        /// <summary>
+        /// There is a fault state condition active in the value source.
+        /// </summary>
+        public const uint GoodFaultStateActive = 0x04070000;
+
+        /// <summary>
+        /// A fault state condition is being requested of the destination.
+        /// </summary>
+        public const uint GoodInitiateFaultState = 0x04080000;
+
+        /// <summary>
+        /// The value is accurate, and the signal source supports cascade handshaking.
+        /// </summary>
+        public const uint GoodCascade = 0x04090000;
     }
 }

DotNet/Opc.Ua.StatusCodes.csv

@@ -247,4 +247,15 @@ BadOperationAbandoned,0x80B30000,"The asynchronous operation was abandoned by th
 BadExpectedStreamToBlock,0x80B40000,"The stream did not return all data requested (possibly because it is a non-blocking stream)."
 BadWouldBlock,0x80B50000,"Non blocking behaviour is required and the operation would block."
 BadSyntaxError,0x80B60000,"A value had an invalid syntax."
-BadMaxConnectionsReached,0x80B70000,"The operation could not be finished because all available connections are in use."
+BadMaxConnectionsReached,0x80B70000,"The operation could not be finished because all available connections are in use."
+UncertainTransducerInManual,0x42080000,"The value may not be accurate because the transducer is in manual mode."
+UncertainSimulatedValue,0x42090000,"The value is simulated."
+UncertainSensorCalibration,0x420A0000,"The value may not be accurate due to a sensor calibration fault."
+UncertainConfigurationError,0x420F0000,"The value may not be accurate due to a configuration issue."
+GoodCascadeInitializationAcknowledged,0x04010000,"The value source supports cascade handshaking and the value has been Initialized based on an initialization request from a cascade secondary."
+GoodCascadeInitializationRequest,0x04020000,"The value source supports cascade handshaking and is requesting initialization of a cascade primary."
+GoodCascadeNotInvited,0x04030000,"The value source supports cascade handshaking, however, the source’s current state does not allow for cascade."
+GoodCascadeNotSelected,0x04040000,"The value source supports cascade handshaking, however, the source has not selected the corresponding cascade primary for use."
+GoodFaultStateActive,0x04070000,"There is a fault state condition active in the value source."
+GoodInitiateFaultState,0x04080000,"A fault state condition is being requested of the destination."
+GoodCascade,0x04090000,"The value is accurate, and the signal source supports cascade handshaking."