# HG changeset patch # User Edouard Tisserant # Date 1642502105 -3600 # Node ID 3e162ea3c726cca3c3f524716fe108252ecf76ce # Parent eac5832a14894442a7e1c6d8a8320a3099029059# Parent 2f5c30054d5026c956b81ff807fab3c6e2dd3596 Merge diff -r eac5832a1489 -r 3e162ea3c726 opc_ua/opcua_client_maker.py --- a/opc_ua/opcua_client_maker.py Tue Jan 18 10:57:43 2022 +0100 +++ b/opc_ua/opcua_client_maker.py Tue Jan 18 11:35:05 2022 +0100 @@ -29,7 +29,7 @@ UA_NODE_ID_types = { "int" : ("UA_NODEID_NUMERIC", "{}" ), "str" : ("UA_NODEID_STRING" , '"{}"'), - "UUIS" : ("UA_NODEID_UUID" , '"{}"'), + "UUID" : ("UA_NODEID_UUID" , '"{}"'), } lstcolnames = [ "Name", "NSIdx", "IdType", "Id", "Type", "IEC"] @@ -485,11 +485,11 @@ #include #include -UA_Client *client; +static UA_Client *client; #define DECL_VAR(ua_type, C_type, c_loc_name) \\ -UA_Variant c_loc_name##_variant; \\ -C_type c_loc_name##_buf = 0; \\ +static UA_Variant c_loc_name##_variant; \\ +static C_type c_loc_name##_buf = 0; \\ C_type *c_loc_name = &c_loc_name##_buf; %(decl)s @@ -501,7 +501,7 @@ } -#define INIT_READ_VARIANT(ua_type, c_loc_name) \\ +#define INIT_READ_VARIANT(ua_type, c_loc_name) \\ UA_Variant_init(&c_loc_name##_variant); #define INIT_WRITE_VARIANT(ua_type, ua_type_enum, c_loc_name) \\