diff --git a/CMakeLists.txt b/CMakeLists.txt index 13296b57..a4902a2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ endif() project(libiec61850) set(LIB_VERSION_MAJOR "0") -set(LIB_VERSION_MINOR "8") -set(LIB_VERSION_PATCH "7") +set(LIB_VERSION_MINOR "9") +set(LIB_VERSION_PATCH "0") # feature checks include(CheckLibraryExists) diff --git a/config/stack_config.h b/config/stack_config.h index 53c649fc..26207ee5 100644 --- a/config/stack_config.h +++ b/config/stack_config.h @@ -141,7 +141,7 @@ /* default results for MMS identify service */ #define CONFIG_DEFAULT_MMS_VENDOR_NAME "libiec61850.com" #define CONFIG_DEFAULT_MMS_MODEL_NAME "LIBIEC61850" -#define CONFIG_DEFAULT_MMS_REVISION "0.8.7" +#define CONFIG_DEFAULT_MMS_REVISION "0.9.0" /* MMS virtual file store base path - where file services are looking for files */ #define CONFIG_VIRTUAL_FILESTORE_BASEPATH "./vmd-filestore/" diff --git a/demos/beaglebone/static_model.c b/demos/beaglebone/static_model.c index 993db3ec..ae7b9539 100644 --- a/demos/beaglebone/static_model.c +++ b/demos/beaglebone/static_model.c @@ -96,7 +96,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -109,7 +109,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -122,7 +122,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -144,7 +144,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -157,7 +157,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -170,7 +170,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -183,7 +183,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -205,7 +205,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -218,7 +218,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -231,7 +231,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -253,7 +253,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -266,7 +266,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -279,7 +279,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -292,7 +292,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -305,7 +305,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -335,7 +335,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -357,7 +357,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -370,7 +370,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -383,7 +383,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -405,7 +405,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -418,7 +418,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -431,7 +431,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -461,7 +461,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -474,7 +474,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -487,7 +487,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -509,7 +509,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -522,7 +522,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -535,7 +535,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -548,7 +548,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -570,7 +570,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -583,7 +583,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -596,7 +596,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -618,7 +618,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -631,7 +631,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -644,7 +644,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -666,7 +666,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn1_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -679,7 +679,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -692,7 +692,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -705,7 +705,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -727,7 +727,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn2_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -740,7 +740,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -753,7 +753,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -766,7 +766,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -788,7 +788,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn3_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -801,7 +801,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -814,7 +814,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -827,7 +827,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -849,7 +849,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn4_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -862,7 +862,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -875,7 +875,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -888,7 +888,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -910,7 +910,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -923,7 +923,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -936,7 +936,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -949,7 +949,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -962,7 +962,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -975,7 +975,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -988,7 +988,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1001,7 +1001,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1014,7 +1014,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1027,7 +1027,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1040,7 +1040,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1053,7 +1053,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1066,7 +1066,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1088,7 +1088,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1101,7 +1101,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1114,7 +1114,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_SBO = { NULL, 0, IEC61850_FC_CO, - VISIBLE_STRING_64, + IEC61850_VISIBLE_STRING_64, 0, NULL, 0}; @@ -1127,7 +1127,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1140,7 +1140,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1153,7 +1153,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1166,7 +1166,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1179,7 +1179,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1192,7 +1192,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1205,7 +1205,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1218,7 +1218,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1231,7 +1231,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1244,7 +1244,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1257,7 +1257,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - INT8, + IEC61850_INT8, 0, NULL, 0}; @@ -1270,7 +1270,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1283,7 +1283,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1296,7 +1296,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1309,7 +1309,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1322,7 +1322,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1335,7 +1335,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1348,7 +1348,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1361,7 +1361,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1383,7 +1383,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1396,7 +1396,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1409,7 +1409,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1422,7 +1422,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1435,7 +1435,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1448,7 +1448,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1461,7 +1461,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1474,7 +1474,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1487,7 +1487,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1500,7 +1500,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1513,7 +1513,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1526,7 +1526,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1539,7 +1539,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1561,7 +1561,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_stVal = { NULL, 0, IEC61850_FC_ST, - CODEDENUM, + IEC61850_CODEDENUM, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1574,7 +1574,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1587,7 +1587,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_DPCSO1_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1600,7 +1600,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1613,7 +1613,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_DPCSO1_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1626,7 +1626,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1639,7 +1639,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1652,7 +1652,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1665,7 +1665,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1678,7 +1678,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1691,7 +1691,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1704,7 +1704,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1717,7 +1717,7 @@ DataAttribute iedModel_GenericIO_GGIO1_DPCSO1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1739,7 +1739,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1752,7 +1752,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1765,7 +1765,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1787,7 +1787,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1800,7 +1800,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1813,7 +1813,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1835,7 +1835,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1848,7 +1848,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1861,7 +1861,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1883,7 +1883,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1896,7 +1896,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1909,7 +1909,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1939,7 +1939,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1952,7 +1952,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1965,7 +1965,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1987,7 +1987,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Mod_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2000,7 +2000,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2013,7 +2013,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2026,7 +2026,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2048,7 +2048,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Str_general = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2061,7 +2061,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Str_dirGeneral = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2074,7 +2074,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Str_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2087,7 +2087,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Str_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2109,7 +2109,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Op_general = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2122,7 +2122,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Op_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2135,7 +2135,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_Op_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2157,7 +2157,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpDlTmms_setVal = { NULL, 0, IEC61850_FC_SP, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2170,7 +2170,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpDlTmms_dataNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2192,7 +2192,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_RsDlTmms_setVal = { NULL, 0, IEC61850_FC_SP, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2205,7 +2205,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_RsDlTmms_dataNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2227,7 +2227,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2240,7 +2240,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2253,7 +2253,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2266,7 +2266,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper = { (ModelNode*) &iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2279,7 +2279,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2292,7 +2292,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_origin = { (ModelNode*) &iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2305,7 +2305,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2318,7 +2318,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2331,7 +2331,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2344,7 +2344,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2357,7 +2357,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2370,7 +2370,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -2383,7 +2383,7 @@ DataAttribute iedModel_GenericIO_TIM_GAPC1_OpCntRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; diff --git a/examples/server_example1/static_model.c b/examples/server_example1/static_model.c index 88e51ab6..c6b25442 100644 --- a/examples/server_example1/static_model.c +++ b/examples/server_example1/static_model.c @@ -218,7 +218,7 @@ DataAttribute iedModel_Device1_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -231,7 +231,7 @@ DataAttribute iedModel_Device1_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -244,7 +244,7 @@ DataAttribute iedModel_Device1_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -266,7 +266,7 @@ DataAttribute iedModel_Device1_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -279,7 +279,7 @@ DataAttribute iedModel_Device1_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -292,7 +292,7 @@ DataAttribute iedModel_Device1_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -314,7 +314,7 @@ DataAttribute iedModel_Device1_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -327,7 +327,7 @@ DataAttribute iedModel_Device1_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -340,7 +340,7 @@ DataAttribute iedModel_Device1_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -362,7 +362,7 @@ DataAttribute iedModel_Device1_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -375,7 +375,7 @@ DataAttribute iedModel_Device1_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -388,7 +388,7 @@ DataAttribute iedModel_Device1_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -401,7 +401,7 @@ DataAttribute iedModel_Device1_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -414,7 +414,7 @@ DataAttribute iedModel_Device1_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -444,7 +444,7 @@ DataAttribute iedModel_Device1_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -466,7 +466,7 @@ DataAttribute iedModel_Device1_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -479,7 +479,7 @@ DataAttribute iedModel_Device1_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -492,7 +492,7 @@ DataAttribute iedModel_Device1_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -514,7 +514,7 @@ DataAttribute iedModel_Device1_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -527,7 +527,7 @@ DataAttribute iedModel_Device1_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -540,7 +540,7 @@ DataAttribute iedModel_Device1_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -570,7 +570,7 @@ DataAttribute iedModel_Device1_DGEN1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -583,7 +583,7 @@ DataAttribute iedModel_Device1_DGEN1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -596,7 +596,7 @@ DataAttribute iedModel_Device1_DGEN1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -618,7 +618,7 @@ DataAttribute iedModel_Device1_DGEN1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -631,7 +631,7 @@ DataAttribute iedModel_Device1_DGEN1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -644,7 +644,7 @@ DataAttribute iedModel_Device1_DGEN1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -666,7 +666,7 @@ DataAttribute iedModel_Device1_DGEN1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -679,7 +679,7 @@ DataAttribute iedModel_Device1_DGEN1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -692,7 +692,7 @@ DataAttribute iedModel_Device1_DGEN1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -714,7 +714,7 @@ DataAttribute iedModel_Device1_DGEN1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -727,7 +727,7 @@ DataAttribute iedModel_Device1_DGEN1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -740,7 +740,7 @@ DataAttribute iedModel_Device1_DGEN1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -762,7 +762,7 @@ DataAttribute iedModel_Device1_DGEN1_OpTmh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -775,7 +775,7 @@ DataAttribute iedModel_Device1_DGEN1_OpTmh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -788,7 +788,7 @@ DataAttribute iedModel_Device1_DGEN1_OpTmh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -810,7 +810,7 @@ DataAttribute iedModel_Device1_DGEN1_GnOpSt_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -823,7 +823,7 @@ DataAttribute iedModel_Device1_DGEN1_GnOpSt_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -836,7 +836,7 @@ DataAttribute iedModel_Device1_DGEN1_GnOpSt_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -858,7 +858,7 @@ DataAttribute iedModel_Device1_DGEN1_OpTmsRs_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -871,7 +871,7 @@ DataAttribute iedModel_Device1_DGEN1_OpTmsRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -884,7 +884,7 @@ DataAttribute iedModel_Device1_DGEN1_OpTmsRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -906,7 +906,7 @@ DataAttribute iedModel_Device1_DGEN1_TotWh_mag = { (ModelNode*) &iedModel_Device1_DGEN1_TotWh_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -919,7 +919,7 @@ DataAttribute iedModel_Device1_DGEN1_TotWh_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -932,7 +932,7 @@ DataAttribute iedModel_Device1_DGEN1_TotWh_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -945,7 +945,7 @@ DataAttribute iedModel_Device1_DGEN1_TotWh_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -975,7 +975,7 @@ DataAttribute iedModel_Device1_DSCH1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -988,7 +988,7 @@ DataAttribute iedModel_Device1_DSCH1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1001,7 +1001,7 @@ DataAttribute iedModel_Device1_DSCH1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1023,7 +1023,7 @@ DataAttribute iedModel_Device1_DSCH1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1036,7 +1036,7 @@ DataAttribute iedModel_Device1_DSCH1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1049,7 +1049,7 @@ DataAttribute iedModel_Device1_DSCH1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1071,7 +1071,7 @@ DataAttribute iedModel_Device1_DSCH1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1084,7 +1084,7 @@ DataAttribute iedModel_Device1_DSCH1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1097,7 +1097,7 @@ DataAttribute iedModel_Device1_DSCH1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1119,7 +1119,7 @@ DataAttribute iedModel_Device1_DSCH1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1132,7 +1132,7 @@ DataAttribute iedModel_Device1_DSCH1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1145,7 +1145,7 @@ DataAttribute iedModel_Device1_DSCH1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1167,7 +1167,7 @@ DataAttribute iedModel_Device1_DSCH1_SchdSt_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1180,7 +1180,7 @@ DataAttribute iedModel_Device1_DSCH1_SchdSt_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1193,7 +1193,7 @@ DataAttribute iedModel_Device1_DSCH1_SchdSt_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1242,7 +1242,7 @@ DataAttribute iedModel_Device1_DSCH1_SchdAbsTm_val = { NULL, 255, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1255,7 +1255,7 @@ DataAttribute iedModel_Device1_DSCH1_SchdAbsTm_time = { NULL, 255, IEC61850_FC_SP, - TIMESTAMP, + IEC61850_TIMESTAMP, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1285,7 +1285,7 @@ DataAttribute iedModel_Device1_MMXU1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1298,7 +1298,7 @@ DataAttribute iedModel_Device1_MMXU1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1311,7 +1311,7 @@ DataAttribute iedModel_Device1_MMXU1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1333,7 +1333,7 @@ DataAttribute iedModel_Device1_MMXU1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1346,7 +1346,7 @@ DataAttribute iedModel_Device1_MMXU1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1359,7 +1359,7 @@ DataAttribute iedModel_Device1_MMXU1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1381,7 +1381,7 @@ DataAttribute iedModel_Device1_MMXU1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1394,7 +1394,7 @@ DataAttribute iedModel_Device1_MMXU1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1407,7 +1407,7 @@ DataAttribute iedModel_Device1_MMXU1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1429,7 +1429,7 @@ DataAttribute iedModel_Device1_MMXU1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1442,7 +1442,7 @@ DataAttribute iedModel_Device1_MMXU1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1455,7 +1455,7 @@ DataAttribute iedModel_Device1_MMXU1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1485,7 +1485,7 @@ DataAttribute iedModel_Device1_MMXU2_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1498,7 +1498,7 @@ DataAttribute iedModel_Device1_MMXU2_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1511,7 +1511,7 @@ DataAttribute iedModel_Device1_MMXU2_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1533,7 +1533,7 @@ DataAttribute iedModel_Device1_MMXU2_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1546,7 +1546,7 @@ DataAttribute iedModel_Device1_MMXU2_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1559,7 +1559,7 @@ DataAttribute iedModel_Device1_MMXU2_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1581,7 +1581,7 @@ DataAttribute iedModel_Device1_MMXU2_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1594,7 +1594,7 @@ DataAttribute iedModel_Device1_MMXU2_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1607,7 +1607,7 @@ DataAttribute iedModel_Device1_MMXU2_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1629,7 +1629,7 @@ DataAttribute iedModel_Device1_MMXU2_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1642,7 +1642,7 @@ DataAttribute iedModel_Device1_MMXU2_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1655,7 +1655,7 @@ DataAttribute iedModel_Device1_MMXU2_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1677,7 +1677,7 @@ DataAttribute iedModel_Device1_MMXU2_TotW_mag = { (ModelNode*) &iedModel_Device1_MMXU2_TotW_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1690,7 +1690,7 @@ DataAttribute iedModel_Device1_MMXU2_TotW_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1703,7 +1703,7 @@ DataAttribute iedModel_Device1_MMXU2_TotW_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1716,7 +1716,7 @@ DataAttribute iedModel_Device1_MMXU2_TotW_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; diff --git a/examples/server_example2/static_model.c b/examples/server_example2/static_model.c index fdc336cb..ae61c9d5 100644 --- a/examples/server_example2/static_model.c +++ b/examples/server_example2/static_model.c @@ -404,7 +404,7 @@ DataAttribute iedModel_Inverter_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -417,7 +417,7 @@ DataAttribute iedModel_Inverter_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -430,7 +430,7 @@ DataAttribute iedModel_Inverter_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -452,7 +452,7 @@ DataAttribute iedModel_Inverter_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -465,7 +465,7 @@ DataAttribute iedModel_Inverter_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -478,7 +478,7 @@ DataAttribute iedModel_Inverter_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -500,7 +500,7 @@ DataAttribute iedModel_Inverter_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -513,7 +513,7 @@ DataAttribute iedModel_Inverter_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -526,7 +526,7 @@ DataAttribute iedModel_Inverter_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -548,7 +548,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -561,7 +561,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -574,7 +574,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -587,7 +587,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -600,7 +600,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -630,7 +630,7 @@ DataAttribute iedModel_Inverter_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -652,7 +652,7 @@ DataAttribute iedModel_Inverter_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -665,7 +665,7 @@ DataAttribute iedModel_Inverter_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -678,7 +678,7 @@ DataAttribute iedModel_Inverter_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -700,7 +700,7 @@ DataAttribute iedModel_Inverter_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -713,7 +713,7 @@ DataAttribute iedModel_Inverter_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -726,7 +726,7 @@ DataAttribute iedModel_Inverter_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -756,7 +756,7 @@ DataAttribute iedModel_Inverter_ZINV1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -769,7 +769,7 @@ DataAttribute iedModel_Inverter_ZINV1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -782,7 +782,7 @@ DataAttribute iedModel_Inverter_ZINV1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -804,7 +804,7 @@ DataAttribute iedModel_Inverter_ZINV1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -817,7 +817,7 @@ DataAttribute iedModel_Inverter_ZINV1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -830,7 +830,7 @@ DataAttribute iedModel_Inverter_ZINV1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -852,7 +852,7 @@ DataAttribute iedModel_Inverter_ZINV1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -865,7 +865,7 @@ DataAttribute iedModel_Inverter_ZINV1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -878,7 +878,7 @@ DataAttribute iedModel_Inverter_ZINV1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -900,7 +900,7 @@ DataAttribute iedModel_Inverter_ZINV1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -913,7 +913,7 @@ DataAttribute iedModel_Inverter_ZINV1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -926,7 +926,7 @@ DataAttribute iedModel_Inverter_ZINV1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -948,7 +948,7 @@ DataAttribute iedModel_Inverter_ZINV1_WRtg_setMag = { (ModelNode*) &iedModel_Inverter_ZINV1_WRtg_setMag_f, 0, IEC61850_FC_SP, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -961,7 +961,7 @@ DataAttribute iedModel_Inverter_ZINV1_WRtg_setMag_f = { NULL, 0, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -974,7 +974,7 @@ DataAttribute iedModel_Inverter_ZINV1_WRtg_units = { (ModelNode*) &iedModel_Inverter_ZINV1_WRtg_units_SIUnit, 0, IEC61850_FC_CF, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -987,7 +987,7 @@ DataAttribute iedModel_Inverter_ZINV1_WRtg_units_SIUnit = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1009,7 +1009,7 @@ DataAttribute iedModel_Inverter_ZINV1_VarRtg_setMag = { (ModelNode*) &iedModel_Inverter_ZINV1_VarRtg_setMag_f, 0, IEC61850_FC_SP, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1022,7 +1022,7 @@ DataAttribute iedModel_Inverter_ZINV1_VarRtg_setMag_f = { NULL, 0, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -1035,7 +1035,7 @@ DataAttribute iedModel_Inverter_ZINV1_VarRtg_units = { (ModelNode*) &iedModel_Inverter_ZINV1_VarRtg_units_SIUnit, 0, IEC61850_FC_CF, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1048,7 +1048,7 @@ DataAttribute iedModel_Inverter_ZINV1_VarRtg_units_SIUnit = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1070,7 +1070,7 @@ DataAttribute iedModel_Inverter_ZINV1_ACTyp_setVal = { NULL, 0, IEC61850_FC_SP, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -1092,7 +1092,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutWSet_setMag = { (ModelNode*) &iedModel_Inverter_ZINV1_OutWSet_setMag_f, 0, IEC61850_FC_SP, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1105,7 +1105,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutWSet_setMag_f = { NULL, 0, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -1118,7 +1118,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutWSet_units = { (ModelNode*) &iedModel_Inverter_ZINV1_OutWSet_units_SIUnit, 0, IEC61850_FC_CF, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1131,7 +1131,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutWSet_units_SIUnit = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1153,7 +1153,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutVarSet_setMag = { (ModelNode*) &iedModel_Inverter_ZINV1_OutVarSet_setMag_f, 0, IEC61850_FC_SP, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1166,7 +1166,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutVarSet_setMag_f = { NULL, 0, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -1179,7 +1179,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutVarSet_units = { (ModelNode*) &iedModel_Inverter_ZINV1_OutVarSet_units_SIUnit, 0, IEC61850_FC_CF, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1192,7 +1192,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutVarSet_units_SIUnit = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1222,7 +1222,7 @@ DataAttribute iedModel_Inverter_MMXU1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1235,7 +1235,7 @@ DataAttribute iedModel_Inverter_MMXU1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1248,7 +1248,7 @@ DataAttribute iedModel_Inverter_MMXU1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1270,7 +1270,7 @@ DataAttribute iedModel_Inverter_MMXU1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1283,7 +1283,7 @@ DataAttribute iedModel_Inverter_MMXU1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1296,7 +1296,7 @@ DataAttribute iedModel_Inverter_MMXU1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1318,7 +1318,7 @@ DataAttribute iedModel_Inverter_MMXU1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1331,7 +1331,7 @@ DataAttribute iedModel_Inverter_MMXU1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1344,7 +1344,7 @@ DataAttribute iedModel_Inverter_MMXU1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1366,7 +1366,7 @@ DataAttribute iedModel_Inverter_MMXU1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1379,7 +1379,7 @@ DataAttribute iedModel_Inverter_MMXU1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1392,7 +1392,7 @@ DataAttribute iedModel_Inverter_MMXU1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1414,7 +1414,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotW_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_TotW_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1427,7 +1427,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotW_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1440,7 +1440,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotW_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1453,7 +1453,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotW_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1475,7 +1475,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVAr_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_TotVAr_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1488,7 +1488,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVAr_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1501,7 +1501,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVAr_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1514,7 +1514,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVAr_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1536,7 +1536,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVA_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_TotVA_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1549,7 +1549,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVA_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1562,7 +1562,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1575,7 +1575,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1597,7 +1597,7 @@ DataAttribute iedModel_Inverter_MMXU1_Hz_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_Hz_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1610,7 +1610,7 @@ DataAttribute iedModel_Inverter_MMXU1_Hz_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1623,7 +1623,7 @@ DataAttribute iedModel_Inverter_MMXU1_Hz_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1636,7 +1636,7 @@ DataAttribute iedModel_Inverter_MMXU1_Hz_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1667,7 +1667,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsA_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1680,7 +1680,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsA_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1693,7 +1693,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1706,7 +1706,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1719,7 +1719,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1741,7 +1741,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsB_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1754,7 +1754,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsB_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1767,7 +1767,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1780,7 +1780,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1793,7 +1793,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1815,7 +1815,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsC_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1828,7 +1828,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsC_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1841,7 +1841,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1854,7 +1854,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1867,7 +1867,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1889,7 +1889,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_neut_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1902,7 +1902,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_neut_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1915,7 +1915,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1928,7 +1928,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1941,7 +1941,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1972,7 +1972,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsA_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1985,7 +1985,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsA_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1998,7 +1998,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2011,7 +2011,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2024,7 +2024,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2046,7 +2046,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsB_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2059,7 +2059,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsB_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2072,7 +2072,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2085,7 +2085,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2098,7 +2098,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2120,7 +2120,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsC_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2133,7 +2133,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsC_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2146,7 +2146,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2159,7 +2159,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2172,7 +2172,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2194,7 +2194,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_A_neut_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2207,7 +2207,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_A_neut_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2220,7 +2220,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2233,7 +2233,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2246,7 +2246,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2277,7 +2277,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsA_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2290,7 +2290,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsA_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2303,7 +2303,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2316,7 +2316,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2329,7 +2329,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2351,7 +2351,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsB_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2364,7 +2364,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsB_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2377,7 +2377,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2390,7 +2390,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2403,7 +2403,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2425,7 +2425,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsC_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2438,7 +2438,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsC_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2451,7 +2451,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2464,7 +2464,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2477,7 +2477,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2516,7 +2516,7 @@ DataAttribute iedModel_Battery_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2529,7 +2529,7 @@ DataAttribute iedModel_Battery_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2542,7 +2542,7 @@ DataAttribute iedModel_Battery_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2564,7 +2564,7 @@ DataAttribute iedModel_Battery_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2577,7 +2577,7 @@ DataAttribute iedModel_Battery_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2590,7 +2590,7 @@ DataAttribute iedModel_Battery_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2612,7 +2612,7 @@ DataAttribute iedModel_Battery_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2625,7 +2625,7 @@ DataAttribute iedModel_Battery_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2638,7 +2638,7 @@ DataAttribute iedModel_Battery_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2660,7 +2660,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2673,7 +2673,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2686,7 +2686,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2699,7 +2699,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2712,7 +2712,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2742,7 +2742,7 @@ DataAttribute iedModel_Battery_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2764,7 +2764,7 @@ DataAttribute iedModel_Battery_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2777,7 +2777,7 @@ DataAttribute iedModel_Battery_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2790,7 +2790,7 @@ DataAttribute iedModel_Battery_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2812,7 +2812,7 @@ DataAttribute iedModel_Battery_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2825,7 +2825,7 @@ DataAttribute iedModel_Battery_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2838,7 +2838,7 @@ DataAttribute iedModel_Battery_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2868,7 +2868,7 @@ DataAttribute iedModel_Battery_ZBAT1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2881,7 +2881,7 @@ DataAttribute iedModel_Battery_ZBAT1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2894,7 +2894,7 @@ DataAttribute iedModel_Battery_ZBAT1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2916,7 +2916,7 @@ DataAttribute iedModel_Battery_ZBAT1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2929,7 +2929,7 @@ DataAttribute iedModel_Battery_ZBAT1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2942,7 +2942,7 @@ DataAttribute iedModel_Battery_ZBAT1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2964,7 +2964,7 @@ DataAttribute iedModel_Battery_ZBAT1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2977,7 +2977,7 @@ DataAttribute iedModel_Battery_ZBAT1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2990,7 +2990,7 @@ DataAttribute iedModel_Battery_ZBAT1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3012,7 +3012,7 @@ DataAttribute iedModel_Battery_ZBAT1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3025,7 +3025,7 @@ DataAttribute iedModel_Battery_ZBAT1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3038,7 +3038,7 @@ DataAttribute iedModel_Battery_ZBAT1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3060,7 +3060,7 @@ DataAttribute iedModel_Battery_ZBAT1_Vol_mag = { (ModelNode*) &iedModel_Battery_ZBAT1_Vol_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3073,7 +3073,7 @@ DataAttribute iedModel_Battery_ZBAT1_Vol_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3086,7 +3086,7 @@ DataAttribute iedModel_Battery_ZBAT1_Vol_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3099,7 +3099,7 @@ DataAttribute iedModel_Battery_ZBAT1_Vol_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3121,7 +3121,7 @@ DataAttribute iedModel_Battery_ZBAT1_Amp_mag = { (ModelNode*) &iedModel_Battery_ZBAT1_Amp_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3134,7 +3134,7 @@ DataAttribute iedModel_Battery_ZBAT1_Amp_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3147,7 +3147,7 @@ DataAttribute iedModel_Battery_ZBAT1_Amp_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3160,7 +3160,7 @@ DataAttribute iedModel_Battery_ZBAT1_Amp_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3190,7 +3190,7 @@ DataAttribute iedModel_Battery_ZBTC1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3203,7 +3203,7 @@ DataAttribute iedModel_Battery_ZBTC1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3216,7 +3216,7 @@ DataAttribute iedModel_Battery_ZBTC1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3238,7 +3238,7 @@ DataAttribute iedModel_Battery_ZBTC1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3251,7 +3251,7 @@ DataAttribute iedModel_Battery_ZBTC1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3264,7 +3264,7 @@ DataAttribute iedModel_Battery_ZBTC1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3286,7 +3286,7 @@ DataAttribute iedModel_Battery_ZBTC1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3299,7 +3299,7 @@ DataAttribute iedModel_Battery_ZBTC1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3312,7 +3312,7 @@ DataAttribute iedModel_Battery_ZBTC1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3334,7 +3334,7 @@ DataAttribute iedModel_Battery_ZBTC1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3347,7 +3347,7 @@ DataAttribute iedModel_Battery_ZBTC1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3360,7 +3360,7 @@ DataAttribute iedModel_Battery_ZBTC1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3409,7 +3409,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaV_mag = { (ModelNode*) &iedModel_Battery_ZBTC1_ChaV_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3422,7 +3422,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaV_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3435,7 +3435,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaV_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3448,7 +3448,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaV_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3470,7 +3470,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaA_mag = { (ModelNode*) &iedModel_Battery_ZBTC1_ChaA_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3483,7 +3483,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaA_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3496,7 +3496,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3509,7 +3509,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3548,7 +3548,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3561,7 +3561,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3574,7 +3574,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3596,7 +3596,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3609,7 +3609,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3622,7 +3622,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3644,7 +3644,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3657,7 +3657,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3670,7 +3670,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3692,7 +3692,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3705,7 +3705,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3718,7 +3718,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3731,7 +3731,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3744,7 +3744,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3774,7 +3774,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3796,7 +3796,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3809,7 +3809,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3822,7 +3822,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3844,7 +3844,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3857,7 +3857,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3870,7 +3870,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; diff --git a/examples/server_example3/static_model.c b/examples/server_example3/static_model.c index 9208a9fb..8080ff9d 100644 --- a/examples/server_example3/static_model.c +++ b/examples/server_example3/static_model.c @@ -248,7 +248,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -261,7 +261,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -274,7 +274,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -287,7 +287,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -309,7 +309,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -322,7 +322,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -335,7 +335,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -357,7 +357,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -370,7 +370,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -383,7 +383,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -405,7 +405,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -418,7 +418,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -431,7 +431,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -444,7 +444,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -457,7 +457,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -487,7 +487,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -509,7 +509,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -522,7 +522,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -535,7 +535,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -557,7 +557,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -570,7 +570,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -583,7 +583,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -613,7 +613,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -626,7 +626,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -639,7 +639,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -661,7 +661,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -674,7 +674,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -687,7 +687,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -709,7 +709,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -722,7 +722,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -735,7 +735,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -757,7 +757,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -770,7 +770,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -783,7 +783,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -805,7 +805,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn1_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -818,7 +818,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -831,7 +831,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -844,7 +844,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -866,7 +866,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn2_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -879,7 +879,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -892,7 +892,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -905,7 +905,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -927,7 +927,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn3_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -940,7 +940,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -953,7 +953,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -966,7 +966,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -988,7 +988,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn4_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1001,7 +1001,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1014,7 +1014,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1027,7 +1027,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1049,7 +1049,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1062,7 +1062,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1075,7 +1075,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1088,7 +1088,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1101,7 +1101,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1114,7 +1114,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1127,7 +1127,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1140,7 +1140,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1153,7 +1153,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1166,7 +1166,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1179,7 +1179,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1192,7 +1192,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1205,7 +1205,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1227,7 +1227,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1240,7 +1240,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1253,7 +1253,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1266,7 +1266,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1279,7 +1279,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1292,7 +1292,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1305,7 +1305,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1318,7 +1318,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1331,7 +1331,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1344,7 +1344,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1357,7 +1357,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1370,7 +1370,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1383,7 +1383,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1405,7 +1405,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1418,7 +1418,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1431,7 +1431,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1444,7 +1444,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1457,7 +1457,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1470,7 +1470,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1483,7 +1483,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1496,7 +1496,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1509,7 +1509,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1522,7 +1522,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1535,7 +1535,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1548,7 +1548,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1561,7 +1561,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1583,7 +1583,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1596,7 +1596,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1609,7 +1609,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1622,7 +1622,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1635,7 +1635,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1648,7 +1648,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1661,7 +1661,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1674,7 +1674,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1687,7 +1687,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1700,7 +1700,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1713,7 +1713,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1726,7 +1726,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1739,7 +1739,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1761,7 +1761,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1774,7 +1774,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1787,7 +1787,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1809,7 +1809,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1822,7 +1822,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1835,7 +1835,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1857,7 +1857,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1870,7 +1870,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1883,7 +1883,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1905,7 +1905,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1918,7 +1918,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1931,7 +1931,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1944,13 +1944,13 @@ extern ReportControlBlock iedModel_GenericIO_LLN0_report4; extern ReportControlBlock iedModel_GenericIO_LLN0_report5; extern ReportControlBlock iedModel_GenericIO_LLN0_report6; -ReportControlBlock iedModel_GenericIO_LLN0_report0 = {&iedModel_GenericIO_LLN0, "EventsRCB01", "Events1", false, "Events", 4294967295, 8, 111, 50, 1000, &iedModel_GenericIO_LLN0_report1}; -ReportControlBlock iedModel_GenericIO_LLN0_report1 = {&iedModel_GenericIO_LLN0, "EventsIndexed01", "Events2", false, "Events", 1, 8, 111, 50, 1000, &iedModel_GenericIO_LLN0_report2}; -ReportControlBlock iedModel_GenericIO_LLN0_report2 = {&iedModel_GenericIO_LLN0, "EventsIndexed02", "Events2", false, "Events", 1, 8, 111, 50, 1000, &iedModel_GenericIO_LLN0_report3}; -ReportControlBlock iedModel_GenericIO_LLN0_report3 = {&iedModel_GenericIO_LLN0, "EventsIndexed03", "Events2", false, "Events", 1, 8, 111, 50, 1000, &iedModel_GenericIO_LLN0_report4}; -ReportControlBlock iedModel_GenericIO_LLN0_report4 = {&iedModel_GenericIO_LLN0, "Measurements01", "Measurements", true, "Measurements", 1, 0, 111, 50, 1000, &iedModel_GenericIO_LLN0_report5}; -ReportControlBlock iedModel_GenericIO_LLN0_report5 = {&iedModel_GenericIO_LLN0, "Measurements02", "Measurements", true, "Measurements", 1, 0, 111, 50, 1000, &iedModel_GenericIO_LLN0_report6}; -ReportControlBlock iedModel_GenericIO_LLN0_report6 = {&iedModel_GenericIO_LLN0, "Measurements03", "Measurements", true, "Measurements", 1, 0, 111, 50, 1000, NULL}; +ReportControlBlock iedModel_GenericIO_LLN0_report0 = {&iedModel_GenericIO_LLN0, "EventsRCB01", "Events1", false, "Events", 4294967295, 24, 111, 50, 1000, &iedModel_GenericIO_LLN0_report1}; +ReportControlBlock iedModel_GenericIO_LLN0_report1 = {&iedModel_GenericIO_LLN0, "EventsIndexed01", "Events2", false, "Events", 1, 24, 111, 50, 1000, &iedModel_GenericIO_LLN0_report2}; +ReportControlBlock iedModel_GenericIO_LLN0_report2 = {&iedModel_GenericIO_LLN0, "EventsIndexed02", "Events2", false, "Events", 1, 24, 111, 50, 1000, &iedModel_GenericIO_LLN0_report3}; +ReportControlBlock iedModel_GenericIO_LLN0_report3 = {&iedModel_GenericIO_LLN0, "EventsIndexed03", "Events2", false, "Events", 1, 24, 111, 50, 1000, &iedModel_GenericIO_LLN0_report4}; +ReportControlBlock iedModel_GenericIO_LLN0_report4 = {&iedModel_GenericIO_LLN0, "Measurements01", "Measurements", true, "Measurements", 1, 16, 111, 50, 1000, &iedModel_GenericIO_LLN0_report5}; +ReportControlBlock iedModel_GenericIO_LLN0_report5 = {&iedModel_GenericIO_LLN0, "Measurements02", "Measurements", true, "Measurements", 1, 16, 111, 50, 1000, &iedModel_GenericIO_LLN0_report6}; +ReportControlBlock iedModel_GenericIO_LLN0_report6 = {&iedModel_GenericIO_LLN0, "Measurements03", "Measurements", true, "Measurements", 1, 16, 111, 50, 1000, NULL}; diff --git a/examples/server_example4/static_model.c b/examples/server_example4/static_model.c index c391fde0..d5334bcf 100644 --- a/examples/server_example4/static_model.c +++ b/examples/server_example4/static_model.c @@ -238,7 +238,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -251,7 +251,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -264,7 +264,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -286,7 +286,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -299,7 +299,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -312,7 +312,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -334,7 +334,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -347,7 +347,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -360,7 +360,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -382,7 +382,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -395,7 +395,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -408,7 +408,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -421,7 +421,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -434,7 +434,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -464,7 +464,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -486,7 +486,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -499,7 +499,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -512,7 +512,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -534,7 +534,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -547,7 +547,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -560,7 +560,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -590,7 +590,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -603,7 +603,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -616,7 +616,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -638,7 +638,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -651,7 +651,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -664,7 +664,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -686,7 +686,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -699,7 +699,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -712,7 +712,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -734,7 +734,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -747,7 +747,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -760,7 +760,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -782,7 +782,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn1_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -795,7 +795,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -808,7 +808,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -821,7 +821,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -843,7 +843,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn2_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -856,7 +856,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -869,7 +869,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -882,7 +882,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -904,7 +904,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn3_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -917,7 +917,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -930,7 +930,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -943,7 +943,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -965,7 +965,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn4_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -978,7 +978,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -991,7 +991,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1004,7 +1004,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1026,7 +1026,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1039,7 +1039,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1052,7 +1052,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1065,7 +1065,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1078,7 +1078,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1091,7 +1091,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1104,7 +1104,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1117,7 +1117,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1130,7 +1130,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1143,7 +1143,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1156,7 +1156,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1169,7 +1169,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1182,7 +1182,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1204,7 +1204,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1217,7 +1217,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1230,7 +1230,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1243,7 +1243,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1256,7 +1256,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1269,7 +1269,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1282,7 +1282,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1295,7 +1295,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1308,7 +1308,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1321,7 +1321,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1334,7 +1334,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1347,7 +1347,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1360,7 +1360,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1382,7 +1382,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1395,7 +1395,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1408,7 +1408,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1421,7 +1421,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1434,7 +1434,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1447,7 +1447,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1460,7 +1460,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1473,7 +1473,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1486,7 +1486,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1499,7 +1499,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1512,7 +1512,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1525,7 +1525,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1538,7 +1538,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1560,7 +1560,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1573,7 +1573,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1586,7 +1586,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1599,7 +1599,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1612,7 +1612,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1625,7 +1625,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1638,7 +1638,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1651,7 +1651,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1664,7 +1664,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1677,7 +1677,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1690,7 +1690,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1703,7 +1703,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1716,7 +1716,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1738,7 +1738,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1751,7 +1751,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1764,7 +1764,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1786,7 +1786,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1799,7 +1799,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1812,7 +1812,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1834,7 +1834,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1847,7 +1847,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1860,7 +1860,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1882,7 +1882,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1895,7 +1895,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1908,7 +1908,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; diff --git a/examples/server_example5/static_model.c b/examples/server_example5/static_model.c index fdc336cb..ae61c9d5 100644 --- a/examples/server_example5/static_model.c +++ b/examples/server_example5/static_model.c @@ -404,7 +404,7 @@ DataAttribute iedModel_Inverter_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -417,7 +417,7 @@ DataAttribute iedModel_Inverter_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -430,7 +430,7 @@ DataAttribute iedModel_Inverter_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -452,7 +452,7 @@ DataAttribute iedModel_Inverter_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -465,7 +465,7 @@ DataAttribute iedModel_Inverter_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -478,7 +478,7 @@ DataAttribute iedModel_Inverter_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -500,7 +500,7 @@ DataAttribute iedModel_Inverter_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -513,7 +513,7 @@ DataAttribute iedModel_Inverter_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -526,7 +526,7 @@ DataAttribute iedModel_Inverter_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -548,7 +548,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -561,7 +561,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -574,7 +574,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -587,7 +587,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -600,7 +600,7 @@ DataAttribute iedModel_Inverter_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -630,7 +630,7 @@ DataAttribute iedModel_Inverter_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -652,7 +652,7 @@ DataAttribute iedModel_Inverter_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -665,7 +665,7 @@ DataAttribute iedModel_Inverter_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -678,7 +678,7 @@ DataAttribute iedModel_Inverter_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -700,7 +700,7 @@ DataAttribute iedModel_Inverter_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -713,7 +713,7 @@ DataAttribute iedModel_Inverter_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -726,7 +726,7 @@ DataAttribute iedModel_Inverter_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -756,7 +756,7 @@ DataAttribute iedModel_Inverter_ZINV1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -769,7 +769,7 @@ DataAttribute iedModel_Inverter_ZINV1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -782,7 +782,7 @@ DataAttribute iedModel_Inverter_ZINV1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -804,7 +804,7 @@ DataAttribute iedModel_Inverter_ZINV1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -817,7 +817,7 @@ DataAttribute iedModel_Inverter_ZINV1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -830,7 +830,7 @@ DataAttribute iedModel_Inverter_ZINV1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -852,7 +852,7 @@ DataAttribute iedModel_Inverter_ZINV1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -865,7 +865,7 @@ DataAttribute iedModel_Inverter_ZINV1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -878,7 +878,7 @@ DataAttribute iedModel_Inverter_ZINV1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -900,7 +900,7 @@ DataAttribute iedModel_Inverter_ZINV1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -913,7 +913,7 @@ DataAttribute iedModel_Inverter_ZINV1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -926,7 +926,7 @@ DataAttribute iedModel_Inverter_ZINV1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -948,7 +948,7 @@ DataAttribute iedModel_Inverter_ZINV1_WRtg_setMag = { (ModelNode*) &iedModel_Inverter_ZINV1_WRtg_setMag_f, 0, IEC61850_FC_SP, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -961,7 +961,7 @@ DataAttribute iedModel_Inverter_ZINV1_WRtg_setMag_f = { NULL, 0, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -974,7 +974,7 @@ DataAttribute iedModel_Inverter_ZINV1_WRtg_units = { (ModelNode*) &iedModel_Inverter_ZINV1_WRtg_units_SIUnit, 0, IEC61850_FC_CF, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -987,7 +987,7 @@ DataAttribute iedModel_Inverter_ZINV1_WRtg_units_SIUnit = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1009,7 +1009,7 @@ DataAttribute iedModel_Inverter_ZINV1_VarRtg_setMag = { (ModelNode*) &iedModel_Inverter_ZINV1_VarRtg_setMag_f, 0, IEC61850_FC_SP, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1022,7 +1022,7 @@ DataAttribute iedModel_Inverter_ZINV1_VarRtg_setMag_f = { NULL, 0, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -1035,7 +1035,7 @@ DataAttribute iedModel_Inverter_ZINV1_VarRtg_units = { (ModelNode*) &iedModel_Inverter_ZINV1_VarRtg_units_SIUnit, 0, IEC61850_FC_CF, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1048,7 +1048,7 @@ DataAttribute iedModel_Inverter_ZINV1_VarRtg_units_SIUnit = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1070,7 +1070,7 @@ DataAttribute iedModel_Inverter_ZINV1_ACTyp_setVal = { NULL, 0, IEC61850_FC_SP, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -1092,7 +1092,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutWSet_setMag = { (ModelNode*) &iedModel_Inverter_ZINV1_OutWSet_setMag_f, 0, IEC61850_FC_SP, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1105,7 +1105,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutWSet_setMag_f = { NULL, 0, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -1118,7 +1118,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutWSet_units = { (ModelNode*) &iedModel_Inverter_ZINV1_OutWSet_units_SIUnit, 0, IEC61850_FC_CF, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1131,7 +1131,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutWSet_units_SIUnit = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1153,7 +1153,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutVarSet_setMag = { (ModelNode*) &iedModel_Inverter_ZINV1_OutVarSet_setMag_f, 0, IEC61850_FC_SP, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1166,7 +1166,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutVarSet_setMag_f = { NULL, 0, IEC61850_FC_SP, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -1179,7 +1179,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutVarSet_units = { (ModelNode*) &iedModel_Inverter_ZINV1_OutVarSet_units_SIUnit, 0, IEC61850_FC_CF, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1192,7 +1192,7 @@ DataAttribute iedModel_Inverter_ZINV1_OutVarSet_units_SIUnit = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1222,7 +1222,7 @@ DataAttribute iedModel_Inverter_MMXU1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1235,7 +1235,7 @@ DataAttribute iedModel_Inverter_MMXU1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1248,7 +1248,7 @@ DataAttribute iedModel_Inverter_MMXU1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1270,7 +1270,7 @@ DataAttribute iedModel_Inverter_MMXU1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1283,7 +1283,7 @@ DataAttribute iedModel_Inverter_MMXU1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1296,7 +1296,7 @@ DataAttribute iedModel_Inverter_MMXU1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1318,7 +1318,7 @@ DataAttribute iedModel_Inverter_MMXU1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1331,7 +1331,7 @@ DataAttribute iedModel_Inverter_MMXU1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1344,7 +1344,7 @@ DataAttribute iedModel_Inverter_MMXU1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1366,7 +1366,7 @@ DataAttribute iedModel_Inverter_MMXU1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1379,7 +1379,7 @@ DataAttribute iedModel_Inverter_MMXU1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1392,7 +1392,7 @@ DataAttribute iedModel_Inverter_MMXU1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1414,7 +1414,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotW_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_TotW_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1427,7 +1427,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotW_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1440,7 +1440,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotW_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1453,7 +1453,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotW_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1475,7 +1475,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVAr_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_TotVAr_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1488,7 +1488,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVAr_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1501,7 +1501,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVAr_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1514,7 +1514,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVAr_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1536,7 +1536,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVA_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_TotVA_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1549,7 +1549,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVA_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1562,7 +1562,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1575,7 +1575,7 @@ DataAttribute iedModel_Inverter_MMXU1_TotVA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1597,7 +1597,7 @@ DataAttribute iedModel_Inverter_MMXU1_Hz_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_Hz_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1610,7 +1610,7 @@ DataAttribute iedModel_Inverter_MMXU1_Hz_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1623,7 +1623,7 @@ DataAttribute iedModel_Inverter_MMXU1_Hz_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1636,7 +1636,7 @@ DataAttribute iedModel_Inverter_MMXU1_Hz_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1667,7 +1667,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsA_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1680,7 +1680,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsA_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1693,7 +1693,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1706,7 +1706,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1719,7 +1719,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1741,7 +1741,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsB_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1754,7 +1754,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsB_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1767,7 +1767,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1780,7 +1780,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1793,7 +1793,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsB_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1815,7 +1815,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsC_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1828,7 +1828,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_phsC_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1841,7 +1841,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1854,7 +1854,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1867,7 +1867,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_phsC_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1889,7 +1889,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_neut_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1902,7 +1902,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_PhV_neut_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1915,7 +1915,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1928,7 +1928,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1941,7 +1941,7 @@ DataAttribute iedModel_Inverter_MMXU1_PhV_neut_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1972,7 +1972,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsA_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1985,7 +1985,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsA_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1998,7 +1998,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2011,7 +2011,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2024,7 +2024,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2046,7 +2046,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsB_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2059,7 +2059,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsB_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2072,7 +2072,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2085,7 +2085,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2098,7 +2098,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsB_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2120,7 +2120,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsC_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2133,7 +2133,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_A_phsC_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2146,7 +2146,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2159,7 +2159,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2172,7 +2172,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_phsC_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2194,7 +2194,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_A_neut_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2207,7 +2207,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_A_neut_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2220,7 +2220,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2233,7 +2233,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2246,7 +2246,7 @@ DataAttribute iedModel_Inverter_MMXU1_A_neut_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2277,7 +2277,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsA_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2290,7 +2290,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsA_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2303,7 +2303,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2316,7 +2316,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2329,7 +2329,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2351,7 +2351,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsB_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2364,7 +2364,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsB_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2377,7 +2377,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2390,7 +2390,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2403,7 +2403,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsB_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2425,7 +2425,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_cVal = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsC_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2438,7 +2438,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_cVal_mag = { (ModelNode*) &iedModel_Inverter_MMXU1_W_phsC_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2451,7 +2451,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2464,7 +2464,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2477,7 +2477,7 @@ DataAttribute iedModel_Inverter_MMXU1_W_phsC_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2516,7 +2516,7 @@ DataAttribute iedModel_Battery_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2529,7 +2529,7 @@ DataAttribute iedModel_Battery_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2542,7 +2542,7 @@ DataAttribute iedModel_Battery_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2564,7 +2564,7 @@ DataAttribute iedModel_Battery_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2577,7 +2577,7 @@ DataAttribute iedModel_Battery_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2590,7 +2590,7 @@ DataAttribute iedModel_Battery_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2612,7 +2612,7 @@ DataAttribute iedModel_Battery_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2625,7 +2625,7 @@ DataAttribute iedModel_Battery_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2638,7 +2638,7 @@ DataAttribute iedModel_Battery_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2660,7 +2660,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2673,7 +2673,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2686,7 +2686,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2699,7 +2699,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2712,7 +2712,7 @@ DataAttribute iedModel_Battery_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2742,7 +2742,7 @@ DataAttribute iedModel_Battery_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -2764,7 +2764,7 @@ DataAttribute iedModel_Battery_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2777,7 +2777,7 @@ DataAttribute iedModel_Battery_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2790,7 +2790,7 @@ DataAttribute iedModel_Battery_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2812,7 +2812,7 @@ DataAttribute iedModel_Battery_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2825,7 +2825,7 @@ DataAttribute iedModel_Battery_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2838,7 +2838,7 @@ DataAttribute iedModel_Battery_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2868,7 +2868,7 @@ DataAttribute iedModel_Battery_ZBAT1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2881,7 +2881,7 @@ DataAttribute iedModel_Battery_ZBAT1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2894,7 +2894,7 @@ DataAttribute iedModel_Battery_ZBAT1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2916,7 +2916,7 @@ DataAttribute iedModel_Battery_ZBAT1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2929,7 +2929,7 @@ DataAttribute iedModel_Battery_ZBAT1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2942,7 +2942,7 @@ DataAttribute iedModel_Battery_ZBAT1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2964,7 +2964,7 @@ DataAttribute iedModel_Battery_ZBAT1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2977,7 +2977,7 @@ DataAttribute iedModel_Battery_ZBAT1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2990,7 +2990,7 @@ DataAttribute iedModel_Battery_ZBAT1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3012,7 +3012,7 @@ DataAttribute iedModel_Battery_ZBAT1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3025,7 +3025,7 @@ DataAttribute iedModel_Battery_ZBAT1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3038,7 +3038,7 @@ DataAttribute iedModel_Battery_ZBAT1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3060,7 +3060,7 @@ DataAttribute iedModel_Battery_ZBAT1_Vol_mag = { (ModelNode*) &iedModel_Battery_ZBAT1_Vol_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3073,7 +3073,7 @@ DataAttribute iedModel_Battery_ZBAT1_Vol_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3086,7 +3086,7 @@ DataAttribute iedModel_Battery_ZBAT1_Vol_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3099,7 +3099,7 @@ DataAttribute iedModel_Battery_ZBAT1_Vol_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3121,7 +3121,7 @@ DataAttribute iedModel_Battery_ZBAT1_Amp_mag = { (ModelNode*) &iedModel_Battery_ZBAT1_Amp_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3134,7 +3134,7 @@ DataAttribute iedModel_Battery_ZBAT1_Amp_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3147,7 +3147,7 @@ DataAttribute iedModel_Battery_ZBAT1_Amp_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3160,7 +3160,7 @@ DataAttribute iedModel_Battery_ZBAT1_Amp_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3190,7 +3190,7 @@ DataAttribute iedModel_Battery_ZBTC1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3203,7 +3203,7 @@ DataAttribute iedModel_Battery_ZBTC1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3216,7 +3216,7 @@ DataAttribute iedModel_Battery_ZBTC1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3238,7 +3238,7 @@ DataAttribute iedModel_Battery_ZBTC1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3251,7 +3251,7 @@ DataAttribute iedModel_Battery_ZBTC1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3264,7 +3264,7 @@ DataAttribute iedModel_Battery_ZBTC1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3286,7 +3286,7 @@ DataAttribute iedModel_Battery_ZBTC1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3299,7 +3299,7 @@ DataAttribute iedModel_Battery_ZBTC1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3312,7 +3312,7 @@ DataAttribute iedModel_Battery_ZBTC1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3334,7 +3334,7 @@ DataAttribute iedModel_Battery_ZBTC1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3347,7 +3347,7 @@ DataAttribute iedModel_Battery_ZBTC1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3360,7 +3360,7 @@ DataAttribute iedModel_Battery_ZBTC1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3409,7 +3409,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaV_mag = { (ModelNode*) &iedModel_Battery_ZBTC1_ChaV_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3422,7 +3422,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaV_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3435,7 +3435,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaV_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3448,7 +3448,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaV_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3470,7 +3470,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaA_mag = { (ModelNode*) &iedModel_Battery_ZBTC1_ChaA_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3483,7 +3483,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaA_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3496,7 +3496,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaA_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3509,7 +3509,7 @@ DataAttribute iedModel_Battery_ZBTC1_ChaA_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3548,7 +3548,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3561,7 +3561,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3574,7 +3574,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3596,7 +3596,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3609,7 +3609,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3622,7 +3622,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3644,7 +3644,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3657,7 +3657,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3670,7 +3670,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3692,7 +3692,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3705,7 +3705,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3718,7 +3718,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3731,7 +3731,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3744,7 +3744,7 @@ DataAttribute iedModel_Physical_Measurements_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3774,7 +3774,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -3796,7 +3796,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3809,7 +3809,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3822,7 +3822,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3844,7 +3844,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3857,7 +3857,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3870,7 +3870,7 @@ DataAttribute iedModel_Physical_Measurements_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; diff --git a/examples/server_example_61400_25/static_model.c b/examples/server_example_61400_25/static_model.c index ba022fdc..68f61f2f 100644 --- a/examples/server_example_61400_25/static_model.c +++ b/examples/server_example_61400_25/static_model.c @@ -375,7 +375,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper = { (ModelNode*) &iedModel_WTG_LLN0_Mod_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -388,7 +388,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -401,7 +401,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -414,7 +414,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_origin = { (ModelNode*) &iedModel_WTG_LLN0_Mod_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -427,7 +427,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -440,7 +440,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -453,7 +453,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -466,7 +466,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -479,7 +479,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -492,7 +492,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -505,7 +505,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -518,7 +518,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -531,7 +531,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -544,7 +544,7 @@ DataAttribute iedModel_WTG_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -566,7 +566,7 @@ DataAttribute iedModel_WTG_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -579,7 +579,7 @@ DataAttribute iedModel_WTG_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -592,7 +592,7 @@ DataAttribute iedModel_WTG_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -614,7 +614,7 @@ DataAttribute iedModel_WTG_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -627,7 +627,7 @@ DataAttribute iedModel_WTG_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -640,7 +640,7 @@ DataAttribute iedModel_WTG_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -662,7 +662,7 @@ DataAttribute iedModel_WTG_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -675,7 +675,7 @@ DataAttribute iedModel_WTG_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -688,7 +688,7 @@ DataAttribute iedModel_WTG_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -718,7 +718,7 @@ DataAttribute iedModel_WTG_LPHD1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -731,7 +731,7 @@ DataAttribute iedModel_WTG_LPHD1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -744,7 +744,7 @@ DataAttribute iedModel_WTG_LPHD1_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -766,7 +766,7 @@ DataAttribute iedModel_WTG_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -779,7 +779,7 @@ DataAttribute iedModel_WTG_LPHD1_PhyNam_hwRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -792,7 +792,7 @@ DataAttribute iedModel_WTG_LPHD1_PhyNam_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -805,7 +805,7 @@ DataAttribute iedModel_WTG_LPHD1_PhyNam_serNum = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -818,7 +818,7 @@ DataAttribute iedModel_WTG_LPHD1_PhyNam_model = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -840,7 +840,7 @@ DataAttribute iedModel_WTG_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -853,7 +853,7 @@ DataAttribute iedModel_WTG_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -866,7 +866,7 @@ DataAttribute iedModel_WTG_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -888,7 +888,7 @@ DataAttribute iedModel_WTG_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -901,7 +901,7 @@ DataAttribute iedModel_WTG_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -914,7 +914,7 @@ DataAttribute iedModel_WTG_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -944,7 +944,7 @@ DataAttribute iedModel_WTG_WTUR1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -957,7 +957,7 @@ DataAttribute iedModel_WTG_WTUR1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -970,7 +970,7 @@ DataAttribute iedModel_WTG_WTUR1_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -1001,7 +1001,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_TotWh_manRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1014,7 +1014,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1027,7 +1027,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1040,7 +1040,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_TotWh_manRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1053,7 +1053,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1066,7 +1066,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1079,7 +1079,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1092,7 +1092,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1105,7 +1105,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1118,7 +1118,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1131,7 +1131,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1144,7 +1144,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1157,7 +1157,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1170,7 +1170,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1183,7 +1183,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_sboTimeout = { NULL, 0, IEC61850_FC_CF, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -1196,7 +1196,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_manRs_sboClass = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1218,7 +1218,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_TotWh_hisRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1231,7 +1231,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -1244,7 +1244,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1257,7 +1257,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_TotWh_hisRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1270,7 +1270,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1283,7 +1283,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1296,7 +1296,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1309,7 +1309,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1322,7 +1322,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1335,7 +1335,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1348,7 +1348,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1361,7 +1361,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1374,7 +1374,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1387,7 +1387,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_hisRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1409,7 +1409,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_actCtVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1422,7 +1422,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_actCtVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1435,7 +1435,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_actCtVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1457,7 +1457,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_oldCtVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1470,7 +1470,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_oldCtVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1483,7 +1483,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_oldCtVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1496,7 +1496,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_ctTot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -1509,7 +1509,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_dly = { NULL, 32, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -1522,7 +1522,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_mly = { NULL, 13, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -1535,7 +1535,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_yly = { NULL, 21, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -1548,7 +1548,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_tot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -1561,7 +1561,7 @@ DataAttribute iedModel_WTG_WTUR1_TotWh_rsPer = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1592,7 +1592,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_actSt_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1605,7 +1605,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_actSt_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1618,7 +1618,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_actSt_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1640,7 +1640,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_oldSt_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1653,7 +1653,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_oldSt_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1666,7 +1666,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_oldSt_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1697,7 +1697,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1710,7 +1710,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1723,7 +1723,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1736,7 +1736,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1749,7 +1749,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1762,7 +1762,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1775,7 +1775,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1788,7 +1788,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1801,7 +1801,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1814,7 +1814,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1827,7 +1827,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1840,7 +1840,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1853,7 +1853,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1866,7 +1866,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1879,7 +1879,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_sboTimeout = { NULL, 0, IEC61850_FC_CF, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -1892,7 +1892,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_manRs_sboClass = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1914,7 +1914,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1927,7 +1927,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -1940,7 +1940,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1953,7 +1953,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1966,7 +1966,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1979,7 +1979,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1992,7 +1992,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2005,7 +2005,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2018,7 +2018,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2031,7 +2031,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -2044,7 +2044,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2057,7 +2057,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2070,7 +2070,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2083,7 +2083,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_hisRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2105,7 +2105,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_actTmVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2118,7 +2118,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_actTmVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2131,7 +2131,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_actTmVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2153,7 +2153,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_oldTmVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2166,7 +2166,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_oldTmVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2179,7 +2179,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_oldTmVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2192,7 +2192,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_tmTot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2205,7 +2205,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_dly = { NULL, 32, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2218,7 +2218,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_mly = { NULL, 13, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2231,7 +2231,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_yly = { NULL, 21, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2244,7 +2244,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_tot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2257,7 +2257,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stTm_rsPer = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2288,7 +2288,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2301,7 +2301,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2314,7 +2314,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2327,7 +2327,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2340,7 +2340,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2353,7 +2353,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2366,7 +2366,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2379,7 +2379,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2392,7 +2392,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2405,7 +2405,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -2418,7 +2418,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2431,7 +2431,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2444,7 +2444,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2457,7 +2457,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2470,7 +2470,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_sboTimeout = { NULL, 0, IEC61850_FC_CF, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2483,7 +2483,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_manRs_sboClass = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2505,7 +2505,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2518,7 +2518,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -2531,7 +2531,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2544,7 +2544,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2557,7 +2557,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2570,7 +2570,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2583,7 +2583,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2596,7 +2596,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2609,7 +2609,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2622,7 +2622,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -2635,7 +2635,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2648,7 +2648,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2661,7 +2661,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2674,7 +2674,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_hisRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2696,7 +2696,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_actCtVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2709,7 +2709,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_actCtVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2722,7 +2722,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_actCtVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2744,7 +2744,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_oldCtVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2757,7 +2757,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_oldCtVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2770,7 +2770,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_oldCtVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2783,7 +2783,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_ctTot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2796,7 +2796,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_dly = { NULL, 32, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2809,7 +2809,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_mly = { NULL, 13, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2822,7 +2822,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_yly = { NULL, 21, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2835,7 +2835,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_tot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2848,7 +2848,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_stCt_rsPer = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2861,7 +2861,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_preTmms = { NULL, 0, IEC61850_FC_CF, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2874,7 +2874,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_pstTmms = { NULL, 0, IEC61850_FC_CF, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -2887,7 +2887,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_smpTmms = { NULL, 0, IEC61850_FC_CF, - INT16U, + IEC61850_INT16U, 0, NULL, 0}; @@ -2900,7 +2900,7 @@ DataAttribute iedModel_WTG_WTUR1_TurSt_datSetMx = { NULL, 0, IEC61850_FC_CF, - VISIBLE_STRING_129, + IEC61850_VISIBLE_STRING_129, 0, NULL, 0}; @@ -2922,7 +2922,7 @@ DataAttribute iedModel_WTG_WTUR1_W_instMag = { (ModelNode*) &iedModel_WTG_WTUR1_W_instMag_i, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2935,7 +2935,7 @@ DataAttribute iedModel_WTG_WTUR1_W_instMag_i = { NULL, 0, IEC61850_FC_MX, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -2948,7 +2948,7 @@ DataAttribute iedModel_WTG_WTUR1_W_instMag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -2961,7 +2961,7 @@ DataAttribute iedModel_WTG_WTUR1_W_mag = { (ModelNode*) &iedModel_WTG_WTUR1_W_mag_i, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2974,7 +2974,7 @@ DataAttribute iedModel_WTG_WTUR1_W_mag_i = { NULL, 0, IEC61850_FC_MX, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2987,7 +2987,7 @@ DataAttribute iedModel_WTG_WTUR1_W_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3000,7 +3000,7 @@ DataAttribute iedModel_WTG_WTUR1_W_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3013,7 +3013,7 @@ DataAttribute iedModel_WTG_WTUR1_W_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3044,7 +3044,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3057,7 +3057,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -3070,7 +3070,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3083,7 +3083,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3096,7 +3096,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3109,7 +3109,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3122,7 +3122,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3135,7 +3135,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3148,7 +3148,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3161,7 +3161,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -3174,7 +3174,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3187,7 +3187,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3200,7 +3200,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3213,7 +3213,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_actSt_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3235,7 +3235,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_oldSt_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3248,7 +3248,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_oldSt_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3261,7 +3261,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_oldSt_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3292,7 +3292,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3305,7 +3305,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3318,7 +3318,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3331,7 +3331,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3344,7 +3344,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3357,7 +3357,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3370,7 +3370,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3383,7 +3383,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3396,7 +3396,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3409,7 +3409,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -3422,7 +3422,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3435,7 +3435,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3448,7 +3448,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3461,7 +3461,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3474,7 +3474,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_sboTimeout = { NULL, 0, IEC61850_FC_CF, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -3487,7 +3487,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_manRs_sboClass = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3509,7 +3509,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3522,7 +3522,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -3535,7 +3535,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3548,7 +3548,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3561,7 +3561,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3574,7 +3574,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3587,7 +3587,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3600,7 +3600,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3613,7 +3613,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3626,7 +3626,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -3639,7 +3639,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3652,7 +3652,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3665,7 +3665,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3678,7 +3678,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_hisRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3700,7 +3700,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_actTmVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3713,7 +3713,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_actTmVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3726,7 +3726,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_actTmVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3748,7 +3748,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_oldTmVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3761,7 +3761,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_oldTmVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3774,7 +3774,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_oldTmVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3787,7 +3787,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_tmTot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -3800,7 +3800,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_dly = { NULL, 32, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -3813,7 +3813,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_mly = { NULL, 13, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -3826,7 +3826,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_yly = { NULL, 21, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -3839,7 +3839,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_tot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -3852,7 +3852,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmTm_rsPer = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3883,7 +3883,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3896,7 +3896,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3909,7 +3909,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3922,7 +3922,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3935,7 +3935,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3948,7 +3948,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3961,7 +3961,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3974,7 +3974,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3987,7 +3987,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -4000,7 +4000,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -4013,7 +4013,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -4026,7 +4026,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -4039,7 +4039,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4052,7 +4052,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -4065,7 +4065,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_sboTimeout = { NULL, 0, IEC61850_FC_CF, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -4078,7 +4078,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_manRs_sboClass = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -4100,7 +4100,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -4113,7 +4113,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - INT32, + IEC61850_INT32, 0, NULL, 0}; @@ -4126,7 +4126,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4139,7 +4139,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_origin = { (ModelNode*) &iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -4152,7 +4152,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -4165,7 +4165,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -4178,7 +4178,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -4191,7 +4191,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4204,7 +4204,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -4217,7 +4217,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -4230,7 +4230,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -4243,7 +4243,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -4256,7 +4256,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4269,7 +4269,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_hisRs_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -4291,7 +4291,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_actCtVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -4304,7 +4304,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_actCtVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -4317,7 +4317,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_actCtVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4339,7 +4339,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_oldCtVal_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -4352,7 +4352,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_oldCtVal_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -4365,7 +4365,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_oldCtVal_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4378,7 +4378,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_ctTot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -4391,7 +4391,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_dly = { NULL, 32, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -4404,7 +4404,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_mly = { NULL, 13, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -4417,7 +4417,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_yly = { NULL, 21, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -4430,7 +4430,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_tot = { NULL, 0, IEC61850_FC_ST, - INT32U, + IEC61850_INT32U, 0, NULL, 0}; @@ -4443,7 +4443,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmCt_rsPer = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -4456,7 +4456,7 @@ DataAttribute iedModel_WTG_WTUR1_SetTurOp_cmAcs = { NULL, 0, IEC61850_FC_CF, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; diff --git a/examples/server_example_complex_array/static_model.c b/examples/server_example_complex_array/static_model.c index 458b189f..71cad7d6 100644 --- a/examples/server_example_complex_array/static_model.c +++ b/examples/server_example_complex_array/static_model.c @@ -89,7 +89,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -102,7 +102,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -115,7 +115,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -137,7 +137,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -150,7 +150,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -163,7 +163,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -185,7 +185,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -198,7 +198,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -211,7 +211,7 @@ DataAttribute iedModel_ComplexArray_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -233,7 +233,7 @@ DataAttribute iedModel_ComplexArray_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -246,7 +246,7 @@ DataAttribute iedModel_ComplexArray_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -259,7 +259,7 @@ DataAttribute iedModel_ComplexArray_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -272,7 +272,7 @@ DataAttribute iedModel_ComplexArray_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -285,7 +285,7 @@ DataAttribute iedModel_ComplexArray_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -315,7 +315,7 @@ DataAttribute iedModel_ComplexArray_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -337,7 +337,7 @@ DataAttribute iedModel_ComplexArray_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -350,7 +350,7 @@ DataAttribute iedModel_ComplexArray_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -363,7 +363,7 @@ DataAttribute iedModel_ComplexArray_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -385,7 +385,7 @@ DataAttribute iedModel_ComplexArray_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -398,7 +398,7 @@ DataAttribute iedModel_ComplexArray_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -411,7 +411,7 @@ DataAttribute iedModel_ComplexArray_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -450,7 +450,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_phsAHar_cVal = { (ModelNode*) &iedModel_ComplexArray_MHAI1_HA_phsAHar_cVal_mag, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED + TRG_OPT_DATA_UPDATE, NULL, 0}; @@ -463,7 +463,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_phsAHar_cVal_mag = { (ModelNode*) &iedModel_ComplexArray_MHAI1_HA_phsAHar_cVal_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED + TRG_OPT_DATA_UPDATE, NULL, 0}; @@ -476,7 +476,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_phsAHar_cVal_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED + TRG_OPT_DATA_UPDATE, NULL, 0}; @@ -489,7 +489,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_phsAHar_cVal_ang = { (ModelNode*) &iedModel_ComplexArray_MHAI1_HA_phsAHar_cVal_ang_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED + TRG_OPT_DATA_UPDATE, NULL, 0}; @@ -502,7 +502,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_phsAHar_cVal_ang_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED + TRG_OPT_DATA_UPDATE, NULL, 0}; @@ -515,7 +515,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_phsAHar_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -528,7 +528,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_phsAHar_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -541,7 +541,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_numHar = { NULL, 0, IEC61850_FC_CF, - INT16U, + IEC61850_INT16U, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -554,7 +554,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_numCyc = { NULL, 0, IEC61850_FC_CF, - INT16U, + IEC61850_INT16U, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -567,7 +567,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_evalTm = { NULL, 0, IEC61850_FC_CF, - INT16U, + IEC61850_INT16U, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -580,7 +580,7 @@ DataAttribute iedModel_ComplexArray_MHAI1_HA_frequency = { NULL, 0, IEC61850_FC_CF, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; diff --git a/examples/server_example_control/static_model.c b/examples/server_example_control/static_model.c index fe058594..8bd02ad2 100644 --- a/examples/server_example_control/static_model.c +++ b/examples/server_example_control/static_model.c @@ -351,7 +351,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -364,7 +364,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -377,7 +377,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -399,7 +399,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -412,7 +412,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -425,7 +425,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -447,7 +447,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -460,7 +460,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -473,7 +473,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -495,7 +495,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -508,7 +508,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -521,7 +521,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -534,7 +534,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -547,7 +547,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -577,7 +577,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -599,7 +599,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -612,7 +612,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -625,7 +625,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -647,7 +647,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -660,7 +660,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -673,7 +673,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -703,7 +703,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -716,7 +716,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -729,7 +729,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -751,7 +751,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -764,7 +764,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -777,7 +777,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -799,7 +799,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -812,7 +812,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -825,7 +825,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -847,7 +847,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -860,7 +860,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -873,7 +873,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -895,7 +895,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn1_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -908,7 +908,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -921,7 +921,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -934,7 +934,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -956,7 +956,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn2_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -969,7 +969,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -982,7 +982,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -995,7 +995,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1017,7 +1017,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn3_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1030,7 +1030,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1043,7 +1043,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1056,7 +1056,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1078,7 +1078,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn4_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1091,7 +1091,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1104,7 +1104,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1117,7 +1117,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1139,7 +1139,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1152,7 +1152,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1165,7 +1165,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1178,7 +1178,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1191,7 +1191,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1204,7 +1204,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1217,7 +1217,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1230,7 +1230,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1243,7 +1243,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1256,7 +1256,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1269,7 +1269,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1282,7 +1282,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1295,7 +1295,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1317,7 +1317,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_SBO = { NULL, 0, IEC61850_FC_CO, - VISIBLE_STRING_64, + IEC61850_VISIBLE_STRING_64, 0, NULL, 0}; @@ -1330,7 +1330,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1343,7 +1343,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1356,7 +1356,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1369,7 +1369,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1382,7 +1382,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1395,7 +1395,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1408,7 +1408,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1421,7 +1421,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1434,7 +1434,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1447,7 +1447,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1460,7 +1460,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1473,7 +1473,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1486,7 +1486,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1499,7 +1499,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1512,7 +1512,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1525,7 +1525,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1538,7 +1538,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1551,7 +1551,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1564,7 +1564,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1577,7 +1577,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1590,7 +1590,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1603,7 +1603,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_sboClass = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1625,7 +1625,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1638,7 +1638,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1651,7 +1651,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1664,7 +1664,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1677,7 +1677,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1690,7 +1690,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1703,7 +1703,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1716,7 +1716,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1729,7 +1729,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1742,7 +1742,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1755,7 +1755,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1768,7 +1768,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1781,7 +1781,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1794,7 +1794,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1807,7 +1807,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1820,7 +1820,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1833,7 +1833,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1846,7 +1846,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1859,7 +1859,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1872,7 +1872,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1885,7 +1885,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1907,7 +1907,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_SBOw_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1920,7 +1920,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1933,7 +1933,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_SBOw_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1946,7 +1946,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1959,7 +1959,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1972,7 +1972,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1985,7 +1985,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1998,7 +1998,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2011,7 +2011,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_SBOw_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -2024,7 +2024,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2037,7 +2037,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2050,7 +2050,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2063,7 +2063,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2076,7 +2076,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2089,7 +2089,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2102,7 +2102,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2115,7 +2115,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2128,7 +2128,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -2141,7 +2141,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2154,7 +2154,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2167,7 +2167,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2180,7 +2180,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2193,7 +2193,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2206,7 +2206,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2219,7 +2219,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2232,7 +2232,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2245,7 +2245,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2258,7 +2258,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2271,7 +2271,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2284,7 +2284,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2306,7 +2306,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO5_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2319,7 +2319,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2332,7 +2332,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2345,7 +2345,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO5_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2358,7 +2358,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2371,7 +2371,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2384,7 +2384,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2397,7 +2397,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2410,7 +2410,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2423,7 +2423,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -2436,7 +2436,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2449,7 +2449,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2462,7 +2462,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2475,7 +2475,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2488,7 +2488,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO5_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2501,7 +2501,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2514,7 +2514,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO5_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2527,7 +2527,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2540,7 +2540,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2553,7 +2553,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2566,7 +2566,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2579,7 +2579,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO5_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2601,7 +2601,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_SBO = { NULL, 0, IEC61850_FC_CO, - VISIBLE_STRING_64, + IEC61850_VISIBLE_STRING_64, 0, NULL, 0}; @@ -2614,7 +2614,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO6_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2627,7 +2627,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2640,7 +2640,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2653,7 +2653,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO6_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2666,7 +2666,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2679,7 +2679,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2692,7 +2692,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2705,7 +2705,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2718,7 +2718,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2731,7 +2731,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -2744,7 +2744,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO6_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2757,7 +2757,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2770,7 +2770,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2783,7 +2783,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO6_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2796,7 +2796,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2809,7 +2809,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -2822,7 +2822,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -2835,7 +2835,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2848,7 +2848,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2861,7 +2861,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -2874,7 +2874,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -2887,7 +2887,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2900,7 +2900,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO6_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2922,7 +2922,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO7_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2935,7 +2935,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -2948,7 +2948,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -2961,7 +2961,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO7_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -2974,7 +2974,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -2987,7 +2987,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3000,7 +3000,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3013,7 +3013,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3026,7 +3026,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3039,7 +3039,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -3052,7 +3052,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO7_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3065,7 +3065,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3078,7 +3078,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3091,7 +3091,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO7_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3104,7 +3104,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3117,7 +3117,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3130,7 +3130,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3143,7 +3143,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3156,7 +3156,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3169,7 +3169,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3182,7 +3182,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3195,7 +3195,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3208,7 +3208,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO7_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3230,7 +3230,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO8_SBOw_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3243,7 +3243,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3256,7 +3256,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3269,7 +3269,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO8_SBOw_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3282,7 +3282,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3295,7 +3295,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3308,7 +3308,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3321,7 +3321,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3334,7 +3334,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3347,7 +3347,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_SBOw_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -3360,7 +3360,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO8_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3373,7 +3373,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3386,7 +3386,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3399,7 +3399,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO8_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3412,7 +3412,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3425,7 +3425,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3438,7 +3438,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3451,7 +3451,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3464,7 +3464,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3477,7 +3477,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -3490,7 +3490,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO8_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3503,7 +3503,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3516,7 +3516,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3529,7 +3529,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO8_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3542,7 +3542,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3555,7 +3555,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3568,7 +3568,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3581,7 +3581,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3594,7 +3594,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3607,7 +3607,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO8_origin_orCat, 0, IEC61850_FC_ST, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3620,7 +3620,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_origin_orCat = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3633,7 +3633,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_origin_orIdent = { NULL, 0, IEC61850_FC_ST, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3646,7 +3646,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_ctlNum = { NULL, 0, IEC61850_FC_ST, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3659,7 +3659,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3672,7 +3672,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3685,7 +3685,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3698,7 +3698,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO8_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3720,7 +3720,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO9_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3733,7 +3733,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3746,7 +3746,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO9_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3759,7 +3759,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3772,7 +3772,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3785,7 +3785,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3798,7 +3798,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3811,7 +3811,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3824,7 +3824,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -3837,7 +3837,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Cancel = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO9_Cancel_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3850,7 +3850,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Cancel_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3863,7 +3863,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Cancel_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO9_Cancel_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -3876,7 +3876,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Cancel_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -3889,7 +3889,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Cancel_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -3902,7 +3902,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Cancel_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -3915,7 +3915,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Cancel_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3928,7 +3928,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_Cancel_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -3941,7 +3941,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -3954,7 +3954,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -3967,7 +3967,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -3980,7 +3980,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO9_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -4002,7 +4002,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -4015,7 +4015,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -4028,7 +4028,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4050,7 +4050,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -4063,7 +4063,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -4076,7 +4076,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4098,7 +4098,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -4111,7 +4111,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -4124,7 +4124,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -4146,7 +4146,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -4159,7 +4159,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -4172,7 +4172,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; diff --git a/examples/server_example_goose/static_model.c b/examples/server_example_goose/static_model.c index 8c60853e..64549d37 100644 --- a/examples/server_example_goose/static_model.c +++ b/examples/server_example_goose/static_model.c @@ -292,7 +292,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -305,7 +305,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -318,7 +318,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -340,7 +340,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -353,7 +353,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -366,7 +366,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -388,7 +388,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -401,7 +401,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -414,7 +414,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -436,7 +436,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -449,7 +449,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -462,7 +462,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -475,7 +475,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -488,7 +488,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -518,7 +518,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -540,7 +540,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -553,7 +553,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -566,7 +566,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -588,7 +588,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -601,7 +601,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -614,7 +614,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -644,7 +644,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -657,7 +657,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -670,7 +670,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -692,7 +692,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -705,7 +705,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -718,7 +718,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -740,7 +740,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -753,7 +753,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -766,7 +766,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -788,7 +788,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -801,7 +801,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -814,7 +814,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -836,7 +836,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn1_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -849,7 +849,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -862,7 +862,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -875,7 +875,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -897,7 +897,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn2_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -910,7 +910,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -923,7 +923,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -936,7 +936,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -958,7 +958,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn3_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -971,7 +971,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -984,7 +984,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -997,7 +997,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1019,7 +1019,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn4_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1032,7 +1032,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1045,7 +1045,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1058,7 +1058,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1080,7 +1080,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1093,7 +1093,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1106,7 +1106,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1119,7 +1119,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1132,7 +1132,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1145,7 +1145,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1158,7 +1158,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1171,7 +1171,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1184,7 +1184,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1197,7 +1197,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1210,7 +1210,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1223,7 +1223,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1236,7 +1236,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1258,7 +1258,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1271,7 +1271,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1284,7 +1284,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1297,7 +1297,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1310,7 +1310,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1323,7 +1323,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1336,7 +1336,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1349,7 +1349,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1362,7 +1362,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1375,7 +1375,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1388,7 +1388,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1401,7 +1401,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1414,7 +1414,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1436,7 +1436,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1449,7 +1449,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1462,7 +1462,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1475,7 +1475,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1488,7 +1488,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1501,7 +1501,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1514,7 +1514,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1527,7 +1527,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1540,7 +1540,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1553,7 +1553,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1566,7 +1566,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1579,7 +1579,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1592,7 +1592,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1614,7 +1614,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1627,7 +1627,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1640,7 +1640,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1653,7 +1653,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1666,7 +1666,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1679,7 +1679,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1692,7 +1692,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1705,7 +1705,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1718,7 +1718,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1731,7 +1731,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1744,7 +1744,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1757,7 +1757,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1770,7 +1770,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1792,7 +1792,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1805,7 +1805,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1818,7 +1818,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1840,7 +1840,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1853,7 +1853,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1866,7 +1866,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1888,7 +1888,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1901,7 +1901,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1914,7 +1914,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1936,7 +1936,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1949,7 +1949,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1962,7 +1962,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; diff --git a/examples/server_example_setting_groups/static_model.c b/examples/server_example_setting_groups/static_model.c index af840569..d02d95fe 100644 --- a/examples/server_example_setting_groups/static_model.c +++ b/examples/server_example_setting_groups/static_model.c @@ -134,7 +134,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper = { (ModelNode*) &iedModel_PROT_LLN0_Mod_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -147,7 +147,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -160,7 +160,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -173,7 +173,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_origin = { (ModelNode*) &iedModel_PROT_LLN0_Mod_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -186,7 +186,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -199,7 +199,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -212,7 +212,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -225,7 +225,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -238,7 +238,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -251,7 +251,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -264,7 +264,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -277,7 +277,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -290,7 +290,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -303,7 +303,7 @@ DataAttribute iedModel_PROT_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -325,7 +325,7 @@ DataAttribute iedModel_PROT_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -338,7 +338,7 @@ DataAttribute iedModel_PROT_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -351,7 +351,7 @@ DataAttribute iedModel_PROT_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -373,7 +373,7 @@ DataAttribute iedModel_PROT_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -386,7 +386,7 @@ DataAttribute iedModel_PROT_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -399,7 +399,7 @@ DataAttribute iedModel_PROT_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -421,7 +421,7 @@ DataAttribute iedModel_PROT_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -434,7 +434,7 @@ DataAttribute iedModel_PROT_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -447,7 +447,7 @@ DataAttribute iedModel_PROT_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -460,7 +460,7 @@ DataAttribute iedModel_PROT_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -473,7 +473,7 @@ DataAttribute iedModel_PROT_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -503,7 +503,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -516,7 +516,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyNam_hwRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -529,7 +529,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyNam_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -542,7 +542,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyNam_serNum = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -555,7 +555,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyNam_model = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -568,7 +568,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyNam_location = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -590,7 +590,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -603,7 +603,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -616,7 +616,7 @@ DataAttribute iedModel_PROT_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -638,7 +638,7 @@ DataAttribute iedModel_PROT_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -651,7 +651,7 @@ DataAttribute iedModel_PROT_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -664,7 +664,7 @@ DataAttribute iedModel_PROT_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -694,7 +694,7 @@ DataAttribute iedModel_PROT_PTOC1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -707,7 +707,7 @@ DataAttribute iedModel_PROT_PTOC1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -720,7 +720,7 @@ DataAttribute iedModel_PROT_PTOC1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -742,7 +742,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper = { (ModelNode*) &iedModel_PROT_PTOC1_Mod_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -755,7 +755,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -768,7 +768,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_operTm = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -781,7 +781,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_origin = { (ModelNode*) &iedModel_PROT_PTOC1_Mod_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -794,7 +794,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -807,7 +807,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -820,7 +820,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -833,7 +833,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -846,7 +846,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -859,7 +859,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -872,7 +872,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_stVal = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -885,7 +885,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -898,7 +898,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -911,7 +911,7 @@ DataAttribute iedModel_PROT_PTOC1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -933,7 +933,7 @@ DataAttribute iedModel_PROT_PTOC1_Str_general = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -946,7 +946,7 @@ DataAttribute iedModel_PROT_PTOC1_Str_dirGeneral = { NULL, 0, IEC61850_FC_ST, - ENUMERATED, + IEC61850_ENUMERATED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -959,7 +959,7 @@ DataAttribute iedModel_PROT_PTOC1_Str_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -972,7 +972,7 @@ DataAttribute iedModel_PROT_PTOC1_Str_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -994,7 +994,7 @@ DataAttribute iedModel_PROT_PTOC1_Op_general = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1007,7 +1007,7 @@ DataAttribute iedModel_PROT_PTOC1_Op_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1020,7 +1020,7 @@ DataAttribute iedModel_PROT_PTOC1_Op_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1042,7 +1042,7 @@ DataAttribute iedModel_PROT_PTOC1_StrVal_setMag = { (ModelNode*) &iedModel_PROT_PTOC1_StrVal_setMag_f, 0, IEC61850_FC_SG, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1055,7 +1055,7 @@ DataAttribute iedModel_PROT_PTOC1_StrVal_setMag_f = { NULL, 0, IEC61850_FC_SG, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -1068,7 +1068,7 @@ DataAttribute iedModel_SE_PROT_PTOC1_StrVal_setMag = { (ModelNode*) &iedModel_SE_PROT_PTOC1_StrVal_setMag_f, 0, IEC61850_FC_SE, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1081,7 +1081,7 @@ DataAttribute iedModel_SE_PROT_PTOC1_StrVal_setMag_f = { NULL, 0, IEC61850_FC_SE, - FLOAT32, + IEC61850_FLOAT32, 0, NULL, 0}; @@ -1103,7 +1103,7 @@ DataAttribute iedModel_PROT_PTOC1_OpDlTmms_setVal = { NULL, 0, IEC61850_FC_SG, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1116,7 +1116,7 @@ DataAttribute iedModel_SE_PROT_PTOC1_OpDlTmms_setVal = { NULL, 0, IEC61850_FC_SE, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1138,7 +1138,7 @@ DataAttribute iedModel_PROT_PTOC1_RsDlTmms_setVal = { NULL, 0, IEC61850_FC_SG, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1151,7 +1151,7 @@ DataAttribute iedModel_SE_PROT_PTOC1_RsDlTmms_setVal = { NULL, 0, IEC61850_FC_SE, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1173,7 +1173,7 @@ DataAttribute iedModel_PROT_PTOC1_RstTms_setVal = { NULL, 0, IEC61850_FC_SG, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1186,7 +1186,7 @@ DataAttribute iedModel_SE_PROT_PTOC1_RstTms_setVal = { NULL, 0, IEC61850_FC_SE, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; diff --git a/examples/server_example_threadless/static_model.c b/examples/server_example_threadless/static_model.c index 10cab577..b1bd317e 100644 --- a/examples/server_example_threadless/static_model.c +++ b/examples/server_example_threadless/static_model.c @@ -293,7 +293,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -306,7 +306,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -319,7 +319,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -332,7 +332,7 @@ DataAttribute iedModel_GenericIO_LLN0_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -354,7 +354,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -367,7 +367,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -380,7 +380,7 @@ DataAttribute iedModel_GenericIO_LLN0_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -402,7 +402,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -415,7 +415,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -428,7 +428,7 @@ DataAttribute iedModel_GenericIO_LLN0_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -450,7 +450,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -463,7 +463,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -476,7 +476,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -489,7 +489,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_configRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -502,7 +502,7 @@ DataAttribute iedModel_GenericIO_LLN0_NamPlt_ldNs = { NULL, 0, IEC61850_FC_EX, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -532,7 +532,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyNam_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -554,7 +554,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -567,7 +567,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -580,7 +580,7 @@ DataAttribute iedModel_GenericIO_LPHD1_PhyHealth_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -602,7 +602,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -615,7 +615,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -628,7 +628,7 @@ DataAttribute iedModel_GenericIO_LPHD1_Proxy_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -658,7 +658,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -671,7 +671,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -684,7 +684,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Mod_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -706,7 +706,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -719,7 +719,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -732,7 +732,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Beh_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -754,7 +754,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_stVal = { NULL, 0, IEC61850_FC_ST, - INT32, + IEC61850_INT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -767,7 +767,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -780,7 +780,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Health_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -802,7 +802,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_vendor = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -815,7 +815,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_swRev = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -828,7 +828,7 @@ DataAttribute iedModel_GenericIO_GGIO1_NamPlt_d = { NULL, 0, IEC61850_FC_DC, - VISIBLE_STRING_255, + IEC61850_VISIBLE_STRING_255, 0, NULL, 0}; @@ -850,7 +850,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn1_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -863,7 +863,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -876,7 +876,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -889,7 +889,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn1_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -911,7 +911,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn2_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -924,7 +924,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -937,7 +937,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -950,7 +950,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn2_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -972,7 +972,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn3_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -985,7 +985,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -998,7 +998,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1011,7 +1011,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn3_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1033,7 +1033,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag = { (ModelNode*) &iedModel_GenericIO_GGIO1_AnIn4_mag_f, 0, IEC61850_FC_MX, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1046,7 +1046,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_mag_f = { NULL, 0, IEC61850_FC_MX, - FLOAT32, + IEC61850_FLOAT32, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1059,7 +1059,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_q = { NULL, 0, IEC61850_FC_MX, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1072,7 +1072,7 @@ DataAttribute iedModel_GenericIO_GGIO1_AnIn4_t = { NULL, 0, IEC61850_FC_MX, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1094,7 +1094,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1107,7 +1107,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1120,7 +1120,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1133,7 +1133,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1146,7 +1146,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1159,7 +1159,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1172,7 +1172,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1185,7 +1185,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1198,7 +1198,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1211,7 +1211,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1224,7 +1224,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1237,7 +1237,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1250,7 +1250,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1272,7 +1272,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1285,7 +1285,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1298,7 +1298,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1311,7 +1311,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1324,7 +1324,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1337,7 +1337,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1350,7 +1350,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1363,7 +1363,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1376,7 +1376,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1389,7 +1389,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1402,7 +1402,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1415,7 +1415,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1428,7 +1428,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1450,7 +1450,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1463,7 +1463,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1476,7 +1476,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1489,7 +1489,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1502,7 +1502,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1515,7 +1515,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1528,7 +1528,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1541,7 +1541,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1554,7 +1554,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1567,7 +1567,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1580,7 +1580,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1593,7 +1593,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1606,7 +1606,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1628,7 +1628,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1641,7 +1641,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1654,7 +1654,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1667,7 +1667,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlVal = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1680,7 +1680,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin = { (ModelNode*) &iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat, 0, IEC61850_FC_CO, - CONSTRUCTED, + IEC61850_CONSTRUCTED, 0, NULL, 0}; @@ -1693,7 +1693,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orCat = { NULL, 0, IEC61850_FC_CO, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1706,7 +1706,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_origin_orIdent = { NULL, 0, IEC61850_FC_CO, - OCTET_STRING_64, + IEC61850_OCTET_STRING_64, 0, NULL, 0}; @@ -1719,7 +1719,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_ctlNum = { NULL, 0, IEC61850_FC_CO, - INT8U, + IEC61850_INT8U, 0, NULL, 0}; @@ -1732,7 +1732,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_T = { NULL, 0, IEC61850_FC_CO, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1745,7 +1745,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Test = { NULL, 0, IEC61850_FC_CO, - BOOLEAN, + IEC61850_BOOLEAN, 0, NULL, 0}; @@ -1758,7 +1758,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_Oper_Check = { NULL, 0, IEC61850_FC_CO, - CHECK, + IEC61850_CHECK, 0, NULL, 0}; @@ -1771,7 +1771,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_ctlModel = { NULL, 0, IEC61850_FC_CF, - ENUMERATED, + IEC61850_ENUMERATED, 0, NULL, 0}; @@ -1784,7 +1784,7 @@ DataAttribute iedModel_GenericIO_GGIO1_SPCSO4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1806,7 +1806,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1819,7 +1819,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1832,7 +1832,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind1_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1854,7 +1854,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1867,7 +1867,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1880,7 +1880,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind2_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1902,7 +1902,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1915,7 +1915,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1928,7 +1928,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind3_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; @@ -1950,7 +1950,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_stVal = { NULL, 0, IEC61850_FC_ST, - BOOLEAN, + IEC61850_BOOLEAN, 0 + TRG_OPT_DATA_CHANGED, NULL, 0}; @@ -1963,7 +1963,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_q = { NULL, 0, IEC61850_FC_ST, - QUALITY, + IEC61850_QUALITY, 0 + TRG_OPT_QUALITY_CHANGED, NULL, 0}; @@ -1976,7 +1976,7 @@ DataAttribute iedModel_GenericIO_GGIO1_Ind4_t = { NULL, 0, IEC61850_FC_ST, - TIMESTAMP, + IEC61850_TIMESTAMP, 0, NULL, 0}; diff --git a/src/iec61850/inc/iec61850_model.h b/src/iec61850/inc/iec61850_model.h index 665a2491..a94204d7 100644 --- a/src/iec61850/inc/iec61850_model.h +++ b/src/iec61850/inc/iec61850_model.h @@ -82,36 +82,71 @@ typedef struct sGSEControlBlock GSEControlBlock; typedef enum { - BOOLEAN = 0,/* int */ - INT8 = 1, /* int8_t */ - INT16 = 2, /* int16_t */ - INT32 = 3, /* int32_t */ - INT64 = 4, /* int64_t */ - INT128 = 5, /* no native mapping! */ - INT8U = 6, /* uint8_t */ - INT16U = 7, /* uint16_t */ - INT24U = 8, /* uint32_t */ - INT32U = 9, /* uint32_t */ - FLOAT32 = 10, /* float */ - FLOAT64 = 11, /* double */ - ENUMERATED = 12, - OCTET_STRING_64 = 13, - OCTET_STRING_6 = 14, - OCTET_STRING_8 = 15, - VISIBLE_STRING_32 = 16, - VISIBLE_STRING_64 = 17, - VISIBLE_STRING_65 = 18, - VISIBLE_STRING_129 = 19, - VISIBLE_STRING_255 = 20, - UNICODE_STRING_255 = 21, - TIMESTAMP = 22, - QUALITY = 23, - CHECK = 24, - CODEDENUM = 25, - GENERIC_BITSTRING = 26, - CONSTRUCTED = 27, - ENTRY_TIME = 28, - PHYCOMADDR = 29 + IEC61850_BOOLEAN = 0,/* int */ + IEC61850_INT8 = 1, /* int8_t */ + IEC61850_INT16 = 2, /* int16_t */ + IEC61850_INT32 = 3, /* int32_t */ + IEC61850_INT64 = 4, /* int64_t */ + IEC61850_INT128 = 5, /* no native mapping! */ + IEC61850_INT8U = 6, /* uint8_t */ + IEC61850_INT16U = 7, /* uint16_t */ + IEC61850_INT24U = 8, /* uint32_t */ + IEC61850_INT32U = 9, /* uint32_t */ + IEC61850_FLOAT32 = 10, /* float */ + IEC61850_FLOAT64 = 11, /* double */ + IEC61850_ENUMERATED = 12, + IEC61850_OCTET_STRING_64 = 13, + IEC61850_OCTET_STRING_6 = 14, + IEC61850_OCTET_STRING_8 = 15, + IEC61850_VISIBLE_STRING_32 = 16, + IEC61850_VISIBLE_STRING_64 = 17, + IEC61850_VISIBLE_STRING_65 = 18, + IEC61850_VISIBLE_STRING_129 = 19, + IEC61850_VISIBLE_STRING_255 = 20, + IEC61850_UNICODE_STRING_255 = 21, + IEC61850_TIMESTAMP = 22, + IEC61850_QUALITY = 23, + IEC61850_CHECK = 24, + IEC61850_CODEDENUM = 25, + IEC61850_GENERIC_BITSTRING = 26, + IEC61850_CONSTRUCTED = 27, + IEC61850_ENTRY_TIME = 28, + IEC61850_PHYCOMADDR = 29 + + +#if (CONFIG_IEC61850_USE_COMPAT_TYPE_DECLARATIONS == 1) + , + BOOLEAN = 0,/* int */ + INT8 = 1, /* int8_t */ + INT16 = 2, /* int16_t */ + INT32 = 3, /* int32_t */ + INT64 = 4, /* int64_t */ + INT128 = 5, /* no native mapping! */ + INT8U = 6, /* uint8_t */ + INT16U = 7, /* uint16_t */ + INT24U = 8, /* uint32_t */ + INT32U = 9, /* uint32_t */ + FLOAT32 = 10, /* float */ + FLOAT64 = 11, /* double */ + ENUMERATED = 12, + OCTET_STRING_64 = 13, + OCTET_STRING_6 = 14, + OCTET_STRING_8 = 15, + VISIBLE_STRING_32 = 16, + VISIBLE_STRING_64 = 17, + VISIBLE_STRING_65 = 18, + VISIBLE_STRING_129 = 19, + VISIBLE_STRING_255 = 20, + UNICODE_STRING_255 = 21, + TIMESTAMP = 22, + QUALITY = 23, + CHECK = 24, + CODEDENUM = 25, + GENERIC_BITSTRING = 26, + CONSTRUCTED = 27, + ENTRY_TIME = 28, + PHYCOMADDR = 29 +#endif } DataAttributeType; typedef enum { diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c index b4e2246f..40064194 100644 --- a/src/iec61850/server/mms_mapping/mms_mapping.c +++ b/src/iec61850/server/mms_mapping/mms_mapping.c @@ -154,118 +154,118 @@ createNamedVariableFromDataAttribute(DataAttribute* attribute) } else { switch (attribute->type) { - case BOOLEAN: + case IEC61850_BOOLEAN: namedVariable->type = MMS_BOOLEAN; break; - case INT8: + case IEC61850_INT8: namedVariable->typeSpec.integer = 8; namedVariable->type = MMS_INTEGER; break; - case INT16: + case IEC61850_INT16: namedVariable->typeSpec.integer = 16; namedVariable->type = MMS_INTEGER; break; - case INT32: + case IEC61850_INT32: namedVariable->typeSpec.integer = 32; namedVariable->type = MMS_INTEGER; break; - case INT64: + case IEC61850_INT64: namedVariable->typeSpec.integer = 64; namedVariable->type = MMS_INTEGER; break; - case INT128: + case IEC61850_INT128: namedVariable->typeSpec.integer = 128; namedVariable->type = MMS_INTEGER; break; - case INT8U: + case IEC61850_INT8U: namedVariable->typeSpec.unsignedInteger = 8; namedVariable->type = MMS_UNSIGNED; break; - case INT16U: + case IEC61850_INT16U: namedVariable->typeSpec.unsignedInteger = 16; namedVariable->type = MMS_UNSIGNED; break; - case INT24U: + case IEC61850_INT24U: namedVariable->typeSpec.unsignedInteger = 24; namedVariable->type = MMS_UNSIGNED; break; - case INT32U: + case IEC61850_INT32U: namedVariable->typeSpec.unsignedInteger = 32; namedVariable->type = MMS_UNSIGNED; break; - case FLOAT32: + case IEC61850_FLOAT32: namedVariable->typeSpec.floatingpoint.formatWidth = 32; namedVariable->typeSpec.floatingpoint.exponentWidth = 8; namedVariable->type = MMS_FLOAT; break; - case FLOAT64: + case IEC61850_FLOAT64: namedVariable->typeSpec.floatingpoint.formatWidth = 64; namedVariable->typeSpec.floatingpoint.exponentWidth = 11; namedVariable->type = MMS_FLOAT; break; - case ENUMERATED: + case IEC61850_ENUMERATED: namedVariable->typeSpec.integer = 8; /* 8 bit integer should be enough for all enumerations */ namedVariable->type = MMS_INTEGER; break; - case CHECK: + case IEC61850_CHECK: namedVariable->typeSpec.bitString = -2; namedVariable->type = MMS_BIT_STRING; break; - case CODEDENUM: + case IEC61850_CODEDENUM: namedVariable->typeSpec.bitString = 2; namedVariable->type = MMS_BIT_STRING; break; - case OCTET_STRING_6: + case IEC61850_OCTET_STRING_6: namedVariable->typeSpec.octetString = -6; namedVariable->type = MMS_OCTET_STRING; break; - case OCTET_STRING_8: + case IEC61850_OCTET_STRING_8: namedVariable->typeSpec.octetString = 8; namedVariable->type = MMS_OCTET_STRING; break; - case OCTET_STRING_64: + case IEC61850_OCTET_STRING_64: namedVariable->typeSpec.octetString = -64; namedVariable->type = MMS_OCTET_STRING; break; - case VISIBLE_STRING_32: + case IEC61850_VISIBLE_STRING_32: namedVariable->typeSpec.visibleString = -129; namedVariable->type = MMS_VISIBLE_STRING; break; - case VISIBLE_STRING_64: + case IEC61850_VISIBLE_STRING_64: namedVariable->typeSpec.visibleString = -129; namedVariable->type = MMS_VISIBLE_STRING; break; - case VISIBLE_STRING_65: + case IEC61850_VISIBLE_STRING_65: namedVariable->typeSpec.visibleString = -129; namedVariable->type = MMS_VISIBLE_STRING; break; - case VISIBLE_STRING_129: + case IEC61850_VISIBLE_STRING_129: namedVariable->typeSpec.visibleString = -129; namedVariable->type = MMS_VISIBLE_STRING; break; - case VISIBLE_STRING_255: + case IEC61850_VISIBLE_STRING_255: namedVariable->typeSpec.visibleString = -255; namedVariable->type = MMS_VISIBLE_STRING; break; - case UNICODE_STRING_255: + case IEC61850_UNICODE_STRING_255: namedVariable->typeSpec.mmsString = -255; namedVariable->type = MMS_STRING; break; - case GENERIC_BITSTRING: + case IEC61850_GENERIC_BITSTRING: namedVariable->type = MMS_BIT_STRING; break; - case TIMESTAMP: + case IEC61850_TIMESTAMP: namedVariable->type = MMS_UTC_TIME; break; - case QUALITY: + case IEC61850_QUALITY: namedVariable->typeSpec.bitString = -13; // -13 = up to 13 bits namedVariable->type = MMS_BIT_STRING; break; - case ENTRY_TIME: + case IEC61850_ENTRY_TIME: namedVariable->type = MMS_BINARY_TIME; namedVariable->typeSpec.binaryTime = 6; break; - case PHYCOMADDR: + case IEC61850_PHYCOMADDR: MmsMapping_createPhyComAddrStructure(namedVariable); break; default: diff --git a/src/iec61850/server/model/cdc.c b/src/iec61850/server/model/cdc.c index 9391b998..eb6806e9 100644 --- a/src/iec61850/server/model/cdc.c +++ b/src/iec61850/server/model/cdc.c @@ -35,12 +35,12 @@ DataAttribute* CAC_AnalogueValue_create(const char* name, ModelNode* parent, FunctionalConstraint fc, uint8_t triggerOptions, bool isIntegerNotFloat) { - DataAttribute* analogeValue = DataAttribute_create(name, parent, CONSTRUCTED, fc, triggerOptions, 0, 0); + DataAttribute* analogeValue = DataAttribute_create(name, parent, IEC61850_CONSTRUCTED, fc, triggerOptions, 0, 0); if (isIntegerNotFloat) - DataAttribute_create("i", (ModelNode*) analogeValue, INT32, fc, triggerOptions, 0, 0); + DataAttribute_create("i", (ModelNode*) analogeValue, IEC61850_INT32, fc, triggerOptions, 0, 0); else - DataAttribute_create("f", (ModelNode*) analogeValue, FLOAT32, fc, triggerOptions, 0, 0); + DataAttribute_create("f", (ModelNode*) analogeValue, IEC61850_FLOAT32, fc, triggerOptions, 0, 0); return analogeValue; } @@ -48,12 +48,12 @@ CAC_AnalogueValue_create(const char* name, ModelNode* parent, FunctionalConstrai DataAttribute* CAC_ValWithTrans_create(const char* name, ModelNode* parent, FunctionalConstraint fc, uint8_t triggerOptions, bool hasTransientIndicator) { - DataAttribute* valWithTrans = DataAttribute_create(name, parent, CONSTRUCTED, fc, triggerOptions, 0, 0); + DataAttribute* valWithTrans = DataAttribute_create(name, parent, IEC61850_CONSTRUCTED, fc, triggerOptions, 0, 0); - DataAttribute_create("posVal", (ModelNode*) valWithTrans, INT8, fc, triggerOptions, 0, 0); + DataAttribute_create("posVal", (ModelNode*) valWithTrans, IEC61850_INT8, fc, triggerOptions, 0, 0); if (hasTransientIndicator) - DataAttribute_create("transInd", (ModelNode*) valWithTrans, BOOLEAN, fc, triggerOptions, 0, 0); + DataAttribute_create("transInd", (ModelNode*) valWithTrans, IEC61850_BOOLEAN, fc, triggerOptions, 0, 0); return valWithTrans; } @@ -64,7 +64,7 @@ CAC_ValWithTrans_create(const char* name, ModelNode* parent, FunctionalConstrain DataAttribute* CAC_Vector_create(const char* name, ModelNode* parent, uint32_t options, FunctionalConstraint fc, uint8_t triggerOptions) { - DataAttribute* vector = DataAttribute_create(name, parent, CONSTRUCTED, fc, triggerOptions, 0, 0); + DataAttribute* vector = DataAttribute_create(name, parent, IEC61850_CONSTRUCTED, fc, triggerOptions, 0, 0); CAC_AnalogueValue_create("mag", (ModelNode*) vector, fc, triggerOptions, false); @@ -77,13 +77,13 @@ CAC_Vector_create(const char* name, ModelNode* parent, uint32_t options, Functio DataAttribute* CAC_Point_create(const char* name, ModelNode* parent, FunctionalConstraint fc, uint8_t triggerOptions, bool hasZVal) { - DataAttribute* point = DataAttribute_create(name, parent, CONSTRUCTED, fc, triggerOptions, 0, 0); + DataAttribute* point = DataAttribute_create(name, parent, IEC61850_CONSTRUCTED, fc, triggerOptions, 0, 0); - DataAttribute_create("xVal", (ModelNode*) point, FLOAT32, fc, triggerOptions, 0, 0); - DataAttribute_create("yVal", (ModelNode*) point, FLOAT32, fc, triggerOptions, 0, 0); + DataAttribute_create("xVal", (ModelNode*) point, IEC61850_FLOAT32, fc, triggerOptions, 0, 0); + DataAttribute_create("yVal", (ModelNode*) point, IEC61850_FLOAT32, fc, triggerOptions, 0, 0); if (hasZVal) - DataAttribute_create("zVal", (ModelNode*) point, FLOAT32, fc, triggerOptions, 0, 0); + DataAttribute_create("zVal", (ModelNode*) point, IEC61850_FLOAT32, fc, triggerOptions, 0, 0); return point; } @@ -91,10 +91,10 @@ CAC_Point_create(const char* name, ModelNode* parent, FunctionalConstraint fc, u DataAttribute* CAC_ScaledValueConfig_create(const char* name, ModelNode* parent) { - DataAttribute* scaling = DataAttribute_create(name, parent, CONSTRUCTED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute* scaling = DataAttribute_create(name, parent, IEC61850_CONSTRUCTED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("scaleFactor", (ModelNode*) scaling, FLOAT32, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("offset", (ModelNode*) scaling, FLOAT32, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("scaleFactor", (ModelNode*) scaling, IEC61850_FLOAT32, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("offset", (ModelNode*) scaling, IEC61850_FLOAT32, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); return scaling; } @@ -102,12 +102,12 @@ CAC_ScaledValueConfig_create(const char* name, ModelNode* parent) DataAttribute* CAC_Unit_create(const char* name, ModelNode* parent, bool hasMagnitude) { - DataAttribute* unit = DataAttribute_create(name, parent, CONSTRUCTED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute* unit = DataAttribute_create(name, parent, IEC61850_CONSTRUCTED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("SIUnit", (ModelNode*) unit, ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("SIUnit", (ModelNode*) unit, IEC61850_ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); if (hasMagnitude) - DataAttribute_create("multiplier", (ModelNode*) unit, ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("multiplier", (ModelNode*) unit, IEC61850_ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); return unit; } @@ -119,10 +119,10 @@ CAC_Unit_create(const char* name, ModelNode* parent, bool hasMagnitude) static void addOriginator(char* name, ModelNode* parent, FunctionalConstraint fc) { - DataAttribute* origin = DataAttribute_create(name, parent, CONSTRUCTED, fc, 0 ,0 ,0); + DataAttribute* origin = DataAttribute_create(name, parent, IEC61850_CONSTRUCTED, fc, 0 ,0 ,0); - DataAttribute_create("orCat", (ModelNode*) origin, ENUMERATED, fc, 0, 0, 0); - DataAttribute_create("orIdent", (ModelNode*) origin, OCTET_STRING_64, fc, 0, 0, 0); + DataAttribute_create("orCat", (ModelNode*) origin, IEC61850_ENUMERATED, fc, 0, 0, 0); + DataAttribute_create("orIdent", (ModelNode*) origin, IEC61850_OCTET_STRING_64, fc, 0, 0, 0); } @@ -132,38 +132,38 @@ addGenericOperateElements(DataAttribute* oper, DataAttributeType type, bool isTi DataAttribute_create("ctlVal", (ModelNode*) oper, type, IEC61850_FC_CO, 0, 0, 0); if (isTimeActivated) - DataAttribute_create("operTm", (ModelNode*) oper, TIMESTAMP, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("operTm", (ModelNode*) oper, IEC61850_TIMESTAMP, IEC61850_FC_CO, 0, 0, 0); addOriginator("origin", (ModelNode*) oper, IEC61850_FC_CO); - DataAttribute_create("ctlNum", (ModelNode*) oper, INT8U, IEC61850_FC_CO, 0, 0, 0); - DataAttribute_create("T", (ModelNode*) oper, TIMESTAMP, IEC61850_FC_CO, 0, 0, 0); - DataAttribute_create("Test", (ModelNode*) oper, BOOLEAN, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("ctlNum", (ModelNode*) oper, IEC61850_INT8U, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("T", (ModelNode*) oper, IEC61850_TIMESTAMP, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("Test", (ModelNode*) oper, IEC61850_BOOLEAN, IEC61850_FC_CO, 0, 0, 0); if (hasCheck) - DataAttribute_create("Check", (ModelNode*) oper, CHECK, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("Check", (ModelNode*) oper, IEC61850_CHECK, IEC61850_FC_CO, 0, 0, 0); } static void addCommonOperateElements(DataAttribute* oper, bool isTimeActivated, bool hasCheck) { if (isTimeActivated) - DataAttribute_create("operTm", (ModelNode*) oper, TIMESTAMP, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("operTm", (ModelNode*) oper, IEC61850_TIMESTAMP, IEC61850_FC_CO, 0, 0, 0); addOriginator("origin", (ModelNode*) oper, IEC61850_FC_CO); - DataAttribute_create("ctlNum", (ModelNode*) oper, INT8U, IEC61850_FC_CO, 0, 0, 0); - DataAttribute_create("T", (ModelNode*) oper, TIMESTAMP, IEC61850_FC_CO, 0, 0, 0); - DataAttribute_create("Test", (ModelNode*) oper, BOOLEAN, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("ctlNum", (ModelNode*) oper, IEC61850_INT8U, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("T", (ModelNode*) oper, IEC61850_TIMESTAMP, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("Test", (ModelNode*) oper, IEC61850_BOOLEAN, IEC61850_FC_CO, 0, 0, 0); if (hasCheck) - DataAttribute_create("Check", (ModelNode*) oper, CHECK, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("Check", (ModelNode*) oper, IEC61850_CHECK, IEC61850_FC_CO, 0, 0, 0); } static DataAttribute* CDA_Oper(ModelNode* parent, DataAttributeType type, bool isTImeActivated) { - DataAttribute* oper = DataAttribute_create("Oper", parent, CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); + DataAttribute* oper = DataAttribute_create("Oper", parent, IEC61850_CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); addGenericOperateElements(oper, type, isTImeActivated, true); @@ -173,7 +173,7 @@ CDA_Oper(ModelNode* parent, DataAttributeType type, bool isTImeActivated) static DataAttribute* CDA_SBOw(ModelNode* parent, DataAttributeType type, bool isTImeActivated) { - DataAttribute* oper = DataAttribute_create("SBOw", parent, CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); + DataAttribute* oper = DataAttribute_create("SBOw", parent, IEC61850_CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); addGenericOperateElements(oper, type, isTImeActivated, true); @@ -183,7 +183,7 @@ CDA_SBOw(ModelNode* parent, DataAttributeType type, bool isTImeActivated) static DataAttribute* CDA_Cancel(ModelNode* parent, DataAttributeType type, bool isTImeActivated) { - DataAttribute* oper = DataAttribute_create("Cancel", parent, CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); + DataAttribute* oper = DataAttribute_create("Cancel", parent, IEC61850_CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); addGenericOperateElements(oper, type, isTImeActivated, false); @@ -199,8 +199,8 @@ CDA_Cancel(ModelNode* parent, DataAttributeType type, bool isTImeActivated) static void CDC_addTimeQuality(DataObject* dataObject, FunctionalConstraint fc) { - DataAttribute_create("q", (ModelNode*) dataObject, QUALITY, fc, TRG_OPT_QUALITY_CHANGED, 0, 0); - DataAttribute_create("t", (ModelNode*) dataObject, TIMESTAMP, fc, 0, 0, 0); + DataAttribute_create("q", (ModelNode*) dataObject, IEC61850_QUALITY, fc, TRG_OPT_QUALITY_CHANGED, 0, 0); + DataAttribute_create("t", (ModelNode*) dataObject, IEC61850_TIMESTAMP, fc, 0, 0, 0); } static void @@ -213,21 +213,21 @@ CDC_addStatusToDataObject(DataObject* dataObject, DataAttributeType statusType) static void CDC_addOptionPicsSubst(DataObject* dataObject, DataAttributeType type) { - DataAttribute_create("subEna", (ModelNode*) dataObject, BOOLEAN, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subEna", (ModelNode*) dataObject, IEC61850_BOOLEAN, IEC61850_FC_SV, 0, 0, 0); DataAttribute_create("subVal", (ModelNode*) dataObject, type, IEC61850_FC_SV, 0, 0, 0); - DataAttribute_create("subQ", (ModelNode*) dataObject, QUALITY, IEC61850_FC_SV, 0, 0, 0); - DataAttribute_create("subID", (ModelNode*) dataObject, VISIBLE_STRING_64, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subQ", (ModelNode*) dataObject, IEC61850_QUALITY, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subID", (ModelNode*) dataObject, IEC61850_VISIBLE_STRING_64, IEC61850_FC_SV, 0, 0, 0); } static void CDC_addOptionPicsSubstValWithTrans(DataObject* dataObject, bool hasTransientIndicator) { - DataAttribute_create("subEna", (ModelNode*) dataObject, BOOLEAN, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subEna", (ModelNode*) dataObject, IEC61850_BOOLEAN, IEC61850_FC_SV, 0, 0, 0); CAC_ValWithTrans_create("subVal", (ModelNode*) dataObject, IEC61850_FC_SV, 0, hasTransientIndicator); - DataAttribute_create("subQ", (ModelNode*) dataObject, QUALITY, IEC61850_FC_SV, 0, 0, 0); - DataAttribute_create("subID", (ModelNode*) dataObject, VISIBLE_STRING_64, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subQ", (ModelNode*) dataObject, IEC61850_QUALITY, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subID", (ModelNode*) dataObject, IEC61850_VISIBLE_STRING_64, IEC61850_FC_SV, 0, 0, 0); } /* Add optional attributes for extension (name spaces) and textual descriptions */ @@ -236,18 +236,18 @@ CDC_addStandardOptions(DataObject* dataObject, uint32_t options) { /* Standard options ? */ if (options & CDC_OPTION_DESC) - DataAttribute_create("d",(ModelNode*) dataObject, VISIBLE_STRING_255, IEC61850_FC_DC, 0, 0, 0); + DataAttribute_create("d",(ModelNode*) dataObject, IEC61850_VISIBLE_STRING_255, IEC61850_FC_DC, 0, 0, 0); if (options & CDC_OPTION_DESC_UNICODE) - DataAttribute_create("dU", (ModelNode*) dataObject, UNICODE_STRING_255, IEC61850_FC_DC, 0, 0, 0); + DataAttribute_create("dU", (ModelNode*) dataObject, IEC61850_UNICODE_STRING_255, IEC61850_FC_DC, 0, 0, 0); if (options & CDC_OPTION_AC_DLNDA) { - DataAttribute_create("cdcNs", (ModelNode*) dataObject, VISIBLE_STRING_255, IEC61850_FC_EX, 0, 0, 0); - DataAttribute_create("cdcName", (ModelNode*) dataObject, VISIBLE_STRING_255, IEC61850_FC_EX, 0, 0, 0); + DataAttribute_create("cdcNs", (ModelNode*) dataObject, IEC61850_VISIBLE_STRING_255, IEC61850_FC_EX, 0, 0, 0); + DataAttribute_create("cdcName", (ModelNode*) dataObject, IEC61850_VISIBLE_STRING_255, IEC61850_FC_EX, 0, 0, 0); } if (options & CDC_OPTION_AC_DLN) - DataAttribute_create("dataNs", (ModelNode*) dataObject, VISIBLE_STRING_255, IEC61850_FC_EX, 0, 0, 0); + DataAttribute_create("dataNs", (ModelNode*) dataObject, IEC61850_VISIBLE_STRING_255, IEC61850_FC_EX, 0, 0, 0); } /************************************************ @@ -259,13 +259,13 @@ CDC_SPS_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newSPS = DataObject_create(dataObjectName, parent, 0); - CDC_addStatusToDataObject(newSPS, BOOLEAN); + CDC_addStatusToDataObject(newSPS, IEC61850_BOOLEAN); if (options & CDC_OPTION_PICS_SUBST) - CDC_addOptionPicsSubst(newSPS, BOOLEAN); + CDC_addOptionPicsSubst(newSPS, IEC61850_BOOLEAN); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newSPS, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newSPS, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); CDC_addStandardOptions(newSPS, options); @@ -277,13 +277,13 @@ CDC_DPS_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newDPS = DataObject_create(dataObjectName, parent, 0); - CDC_addStatusToDataObject(newDPS, CODEDENUM); + CDC_addStatusToDataObject(newDPS, IEC61850_CODEDENUM); if (options & CDC_OPTION_PICS_SUBST) - CDC_addOptionPicsSubst(newDPS, CODEDENUM); + CDC_addOptionPicsSubst(newDPS, IEC61850_CODEDENUM); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newDPS, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newDPS, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); CDC_addStandardOptions(newDPS, options); @@ -295,13 +295,13 @@ CDC_INS_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newINS = DataObject_create(dataObjectName, parent, 0); - CDC_addStatusToDataObject(newINS, INT32); + CDC_addStatusToDataObject(newINS, IEC61850_INT32); if (options & CDC_OPTION_PICS_SUBST) - CDC_addOptionPicsSubst(newINS, INT32); + CDC_addOptionPicsSubst(newINS, IEC61850_INT32); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newINS, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newINS, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); CDC_addStandardOptions(newINS, options); @@ -314,13 +314,13 @@ CDC_ENS_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newENS = DataObject_create(dataObjectName, parent, 0); - CDC_addStatusToDataObject(newENS, ENUMERATED); + CDC_addStatusToDataObject(newENS, IEC61850_ENUMERATED); if (options & CDC_OPTION_PICS_SUBST) - CDC_addOptionPicsSubst(newENS, ENUMERATED); + CDC_addOptionPicsSubst(newENS, IEC61850_ENUMERATED); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newENS, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newENS, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); CDC_addStandardOptions(newENS, options); @@ -332,25 +332,25 @@ CDC_BCR_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newBCR = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("actVal", (ModelNode*) newBCR, INT64, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("actVal", (ModelNode*) newBCR, IEC61850_INT64, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_FROZEN_VALUE) { - DataAttribute_create("frVal", (ModelNode*) newBCR, INT64, IEC61850_FC_ST, TRG_OPT_DATA_UPDATE, 0, 0); - DataAttribute_create("frTm", (ModelNode*) newBCR, TIMESTAMP, IEC61850_FC_ST, 0, 0, 0); + DataAttribute_create("frVal", (ModelNode*) newBCR, IEC61850_INT64, IEC61850_FC_ST, TRG_OPT_DATA_UPDATE, 0, 0); + DataAttribute_create("frTm", (ModelNode*) newBCR, IEC61850_TIMESTAMP, IEC61850_FC_ST, 0, 0, 0); } CDC_addTimeQuality(newBCR, IEC61850_FC_ST); if (options & CDC_OPTION_UNIT) - DataAttribute_create("units", (ModelNode*) newBCR, ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("units", (ModelNode*) newBCR, IEC61850_ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("pulsQty", (ModelNode*) newBCR, FLOAT32, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("pulsQty", (ModelNode*) newBCR, IEC61850_FLOAT32, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_FROZEN_VALUE) { - DataAttribute_create("frEna", (ModelNode*) newBCR, BOOLEAN, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("strTm", (ModelNode*) newBCR, TIMESTAMP, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("frPd", (ModelNode*) newBCR, INT32, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("frRs", (ModelNode*) newBCR, BOOLEAN, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("frEna", (ModelNode*) newBCR, IEC61850_BOOLEAN, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("strTm", (ModelNode*) newBCR, IEC61850_TIMESTAMP, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("frPd", (ModelNode*) newBCR, IEC61850_INT32, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("frRs", (ModelNode*) newBCR, IEC61850_BOOLEAN, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); } CDC_addStandardOptions(newBCR, options); @@ -363,15 +363,15 @@ CDC_SEC_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newSEC = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("cnt", (ModelNode*) newSEC, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("sev", (ModelNode*) newSEC, ENUMERATED, IEC61850_FC_ST, 0, 0, 0); - DataAttribute_create("t", (ModelNode*) newSEC, TIMESTAMP, IEC61850_FC_ST, 0, 0, 0); + DataAttribute_create("cnt", (ModelNode*) newSEC, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("sev", (ModelNode*) newSEC, IEC61850_ENUMERATED, IEC61850_FC_ST, 0, 0, 0); + DataAttribute_create("t", (ModelNode*) newSEC, IEC61850_TIMESTAMP, IEC61850_FC_ST, 0, 0, 0); if (options & CDC_OPTION_ADDR) - DataAttribute_create("addr", (ModelNode*) newSEC, OCTET_STRING_64, IEC61850_FC_ST, 0, 0, 0); + DataAttribute_create("addr", (ModelNode*) newSEC, IEC61850_OCTET_STRING_64, IEC61850_FC_ST, 0, 0, 0); if (options & CDC_OPTION_ADDINFO) - DataAttribute_create("addInfo", (ModelNode*) newSEC, VISIBLE_STRING_64, IEC61850_FC_ST, 0, 0, 0); + DataAttribute_create("addInfo", (ModelNode*) newSEC, IEC61850_VISIBLE_STRING_64, IEC61850_FC_ST, 0, 0, 0); CDC_addStandardOptions(newSEC, options); @@ -397,7 +397,7 @@ CDC_MV_create(const char* dataObjectName, ModelNode* parent, uint32_t options, b CAC_AnalogueValue_create("mag", (ModelNode*) newMV, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED | TRG_OPT_DATA_UPDATE, isIntegerNotFloat); if (options & CDC_OPTION_RANGE) - DataAttribute_create("range", (ModelNode*) newMV, ENUMERATED, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("range", (ModelNode*) newMV, IEC61850_ENUMERATED, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addTimeQuality(newMV, IEC61850_FC_MX); @@ -424,10 +424,10 @@ CDC_CMV_create(const char* dataObjectName, ModelNode* parent, uint32_t options) CAC_Vector_create("cVal", (ModelNode*) newMV, options, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED | TRG_OPT_DATA_UPDATE); if (options & CDC_OPTION_RANGE) - DataAttribute_create("range", (ModelNode*) newMV, ENUMERATED, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("range", (ModelNode*) newMV, IEC61850_ENUMERATED, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_RANGE_ANG) - DataAttribute_create("rangeAng", (ModelNode*) newMV, ENUMERATED, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("rangeAng", (ModelNode*) newMV, IEC61850_ENUMERATED, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addTimeQuality(newMV, IEC61850_FC_MX); @@ -477,17 +477,17 @@ CDC_HST_create(const char* dataObjectName, ModelNode* parent, uint32_t options, { DataObject* newHST = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("hstVal", (ModelNode*) newHST, INT32, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED | TRG_OPT_DATA_UPDATE, maxPts, 0); + DataAttribute_create("hstVal", (ModelNode*) newHST, IEC61850_INT32, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED | TRG_OPT_DATA_UPDATE, maxPts, 0); CDC_addTimeQuality(newHST, IEC61850_FC_ST); - DataAttribute_create("numPts", (ModelNode*) newHST, INT16U, IEC61850_FC_CF, 0, 0, 0); + DataAttribute_create("numPts", (ModelNode*) newHST, IEC61850_INT16U, IEC61850_FC_CF, 0, 0, 0); //TODO add mandatory attribute "hstRangeC" CAC_Unit_create("units", (ModelNode*) newHST, options & CDC_OPTION_UNIT_MULTIPLIER); - DataAttribute_create("maxPts", (ModelNode*) newHST, INT16U, IEC61850_FC_CF, 0, 0, 0); + DataAttribute_create("maxPts", (ModelNode*) newHST, IEC61850_INT16U, IEC61850_FC_CF, 0, 0, 0); CDC_addStandardOptions(newHST, options); @@ -499,7 +499,7 @@ static void addControls(DataObject* parent, DataAttributeType type, uint32_t controlOptions) { DataAttribute* ctlModel = - DataAttribute_create("ctlModel", (ModelNode*) parent, ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("ctlModel", (ModelNode*) parent, IEC61850_ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); int controlModel = controlOptions & 0x07; @@ -508,7 +508,7 @@ addControls(DataObject* parent, DataAttributeType type, uint32_t controlOptions) if (controlModel > 0) { if (controlModel == CDC_CTL_MODEL_SBO_NORMAL) - DataAttribute_create("SBO", (ModelNode*) parent, VISIBLE_STRING_129, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("SBO", (ModelNode*) parent, IEC61850_VISIBLE_STRING_129, IEC61850_FC_CO, 0, 0, 0); bool isTimeActivated = false; @@ -533,7 +533,7 @@ addOriginatorAndCtlNumOptions(ModelNode* parent, uint32_t controlOptions) addOriginator("origin", parent, IEC61850_FC_ST); if (controlOptions & CDC_CTL_OPTION_CTL_NUM) - DataAttribute_create("ctlNum", parent, INT8U, IEC61850_FC_ST, 0, 0, 0); + DataAttribute_create("ctlNum", parent, IEC61850_INT8U, IEC61850_FC_ST, 0, 0, 0); } /** @@ -552,15 +552,15 @@ CDC_SPC_create(const char* dataObjectName, ModelNode* parent, uint32_t options, addOriginatorAndCtlNumOptions((ModelNode*) newSPC, controlOptions); - CDC_addStatusToDataObject(newSPC, BOOLEAN); + CDC_addStatusToDataObject(newSPC, IEC61850_BOOLEAN); - addControls(newSPC, BOOLEAN, controlOptions); + addControls(newSPC, IEC61850_BOOLEAN, controlOptions); if (options & CDC_OPTION_PICS_SUBST) - CDC_addOptionPicsSubst(newSPC, BOOLEAN); + CDC_addOptionPicsSubst(newSPC, IEC61850_BOOLEAN); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newSPC, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newSPC, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); CDC_addStandardOptions(newSPC, options); @@ -583,15 +583,15 @@ CDC_DPC_create(const char* dataObjectName, ModelNode* parent, uint32_t options, addOriginatorAndCtlNumOptions((ModelNode*) newDPC, controlOptions); - CDC_addStatusToDataObject(newDPC, CODEDENUM); + CDC_addStatusToDataObject(newDPC, IEC61850_CODEDENUM); - addControls(newDPC, BOOLEAN, controlOptions); + addControls(newDPC, IEC61850_BOOLEAN, controlOptions); if (options & CDC_OPTION_PICS_SUBST) - CDC_addOptionPicsSubst(newDPC, CODEDENUM); + CDC_addOptionPicsSubst(newDPC, IEC61850_CODEDENUM); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newDPC, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newDPC, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); CDC_addStandardOptions(newDPC, options); @@ -602,7 +602,7 @@ static void addAnalogControls(DataObject* parent, uint32_t controlOptions, bool isIntegerNotFloat) { DataAttribute* ctlModel = - DataAttribute_create("ctlModel", (ModelNode*) parent, ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("ctlModel", (ModelNode*) parent, IEC61850_ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); int controlModel = controlOptions & 0x07; @@ -611,7 +611,7 @@ addAnalogControls(DataObject* parent, uint32_t controlOptions, bool isIntegerNot if (controlModel != CDC_CTL_MODEL_NONE) { if (controlModel == CDC_CTL_MODEL_SBO_NORMAL) - DataAttribute_create("SBO", (ModelNode*) parent, VISIBLE_STRING_129, IEC61850_FC_CO, 0, 0, 0); + DataAttribute_create("SBO", (ModelNode*) parent, IEC61850_VISIBLE_STRING_129, IEC61850_FC_CO, 0, 0, 0); bool isTimeActivated = false; @@ -619,21 +619,21 @@ addAnalogControls(DataObject* parent, uint32_t controlOptions, bool isIntegerNot isTimeActivated = true; if (controlModel == CDC_CTL_MODEL_SBO_ENHANCED) { - DataAttribute* sBOw = DataAttribute_create("SBOw", (ModelNode*) parent, CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); + DataAttribute* sBOw = DataAttribute_create("SBOw", (ModelNode*) parent, IEC61850_CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); CAC_AnalogueValue_create("ctlVal", (ModelNode*) sBOw, IEC61850_FC_CO, 0, isIntegerNotFloat); addCommonOperateElements(sBOw, isTimeActivated, true); } - DataAttribute* oper = DataAttribute_create("Oper", (ModelNode*) parent, CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); + DataAttribute* oper = DataAttribute_create("Oper", (ModelNode*) parent, IEC61850_CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); CAC_AnalogueValue_create("ctlVal", (ModelNode*) oper, IEC61850_FC_CO, 0, isIntegerNotFloat); addCommonOperateElements(oper, isTimeActivated, true); if (controlOptions & CDC_CTL_MODEL_HAS_CANCEL) { - DataAttribute* cancel = DataAttribute_create("SBOw", (ModelNode*) parent, CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); + DataAttribute* cancel = DataAttribute_create("SBOw", (ModelNode*) parent, IEC61850_CONSTRUCTED, IEC61850_FC_CO, 0, 0, 0); CAC_AnalogueValue_create("ctlVal", (ModelNode*) cancel, IEC61850_FC_CO, 0, isIntegerNotFloat); @@ -652,33 +652,33 @@ CDC_APC_create(const char* dataObjectName, ModelNode* parent, uint32_t options, addOriginator("origin", (ModelNode*) newAPC, IEC61850_FC_MX); if (controlOptions & CDC_CTL_OPTION_CTL_NUM) - DataAttribute_create("ctlNum", (ModelNode*) newAPC, INT8U, IEC61850_FC_MX, 0, 0, 0); + DataAttribute_create("ctlNum", (ModelNode*) newAPC, IEC61850_INT8U, IEC61850_FC_MX, 0, 0, 0); CAC_AnalogueValue_create("mxVal", (ModelNode*) newAPC, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, isIntegerNotFloat); CDC_addTimeQuality(newAPC, IEC61850_FC_MX); if (controlOptions & CDC_CTL_OPTION_ST_SELD) - DataAttribute_create("stSeld", (ModelNode*) newAPC, BOOLEAN, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("stSeld", (ModelNode*) newAPC, IEC61850_BOOLEAN, IEC61850_FC_MX, TRG_OPT_DATA_CHANGED, 0, 0); if (controlOptions & CDC_CTL_OPTION_OP_RCVD) - DataAttribute_create("opRcvd", (ModelNode*) newAPC, BOOLEAN, IEC61850_FC_OR, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("opRcvd", (ModelNode*) newAPC, IEC61850_BOOLEAN, IEC61850_FC_OR, TRG_OPT_DATA_CHANGED, 0, 0); if (controlOptions & CDC_CTL_OPTION_OP_OK) - DataAttribute_create("opOk", (ModelNode*) newAPC, BOOLEAN, IEC61850_FC_OR, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("opOk", (ModelNode*) newAPC, IEC61850_BOOLEAN, IEC61850_FC_OR, TRG_OPT_DATA_CHANGED, 0, 0); if (controlOptions & CDC_CTL_OPTION_T_OP_OK) - DataAttribute_create("tOpOk", (ModelNode*) newAPC, BOOLEAN, IEC61850_FC_OR, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("tOpOk", (ModelNode*) newAPC, IEC61850_BOOLEAN, IEC61850_FC_OR, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_PICS_SUBST) { - DataAttribute_create("subEna", (ModelNode*) newAPC, BOOLEAN, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subEna", (ModelNode*) newAPC, IEC61850_BOOLEAN, IEC61850_FC_SV, 0, 0, 0); CAC_AnalogueValue_create("subVal", (ModelNode*) newAPC, IEC61850_FC_SV, 0, isIntegerNotFloat); - DataAttribute_create("subQ", (ModelNode*) newAPC, QUALITY, IEC61850_FC_SV, 0, 0, 0); - DataAttribute_create("subID", (ModelNode*) newAPC, VISIBLE_STRING_64, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subQ", (ModelNode*) newAPC, IEC61850_QUALITY, IEC61850_FC_SV, 0, 0, 0); + DataAttribute_create("subID", (ModelNode*) newAPC, IEC61850_VISIBLE_STRING_64, IEC61850_FC_SV, 0, 0, 0); } if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newAPC, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newAPC, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); addAnalogControls(newAPC, controlOptions, isIntegerNotFloat); @@ -695,24 +695,24 @@ CDC_INC_create(const char* dataObjectName, ModelNode* parent, uint32_t options, addOriginatorAndCtlNumOptions((ModelNode*) newINC, controlOptions); - CDC_addStatusToDataObject(newINC, INT32); + CDC_addStatusToDataObject(newINC, IEC61850_INT32); - addControls(newINC, INT32, controlOptions); + addControls(newINC, IEC61850_INT32, controlOptions); if (options & CDC_OPTION_PICS_SUBST) - CDC_addOptionPicsSubst(newINC, INT32); + CDC_addOptionPicsSubst(newINC, IEC61850_INT32); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newINC, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newINC, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); if (options & CDC_OPTION_MIN) - DataAttribute_create("minVal", (ModelNode*) newINC, INT32, IEC61850_FC_CF, 0, 0, 0); + DataAttribute_create("minVal", (ModelNode*) newINC, IEC61850_INT32, IEC61850_FC_CF, 0, 0, 0); if (options & CDC_OPTION_MAX) - DataAttribute_create("maxVal", (ModelNode*) newINC, INT32, IEC61850_FC_CF, 0, 0, 0); + DataAttribute_create("maxVal", (ModelNode*) newINC, IEC61850_INT32, IEC61850_FC_CF, 0, 0, 0); if (options & CDC_OPTION_STEP_SIZE) - DataAttribute_create("stepSize", (ModelNode*) newINC, INT32U, IEC61850_FC_CF, 0, 0, 0); + DataAttribute_create("stepSize", (ModelNode*) newINC, IEC61850_INT32U, IEC61850_FC_CF, 0, 0, 0); CDC_addStandardOptions(newINC, options); @@ -726,15 +726,15 @@ CDC_ENC_create(const char* dataObjectName, ModelNode* parent, uint32_t options, addOriginatorAndCtlNumOptions((ModelNode*) newENC, controlOptions); - CDC_addStatusToDataObject(newENC, ENUMERATED); + CDC_addStatusToDataObject(newENC, IEC61850_ENUMERATED); - addControls(newENC, ENUMERATED, controlOptions); + addControls(newENC, IEC61850_ENUMERATED, controlOptions); if (options & CDC_OPTION_PICS_SUBST) - CDC_addOptionPicsSubst(newENC, ENUMERATED); + CDC_addOptionPicsSubst(newENC, IEC61850_ENUMERATED); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newENC, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newENC, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); CDC_addStandardOptions(newENC, options); @@ -751,15 +751,15 @@ CDC_BSC_create(const char* dataObjectName, ModelNode* parent, uint32_t options, CAC_ValWithTrans_create("valWTr", (ModelNode*) newBSC, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, hasTransientIndicator); CDC_addTimeQuality(newBSC, IEC61850_FC_ST); - DataAttribute_create("persistent", (ModelNode*) newBSC, BOOLEAN, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("persistent", (ModelNode*) newBSC, IEC61850_BOOLEAN, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); - addControls(newBSC, CODEDENUM, controlOptions); + addControls(newBSC, IEC61850_CODEDENUM, controlOptions); if (options & CDC_OPTION_PICS_SUBST) CDC_addOptionPicsSubstValWithTrans(newBSC, hasTransientIndicator); if (options & CDC_OPTION_BLK_ENA) - DataAttribute_create("blkEna", (ModelNode*) newBSC, BOOLEAN, IEC61850_FC_BL, 0, 0, 0); + DataAttribute_create("blkEna", (ModelNode*) newBSC, IEC61850_BOOLEAN, IEC61850_FC_BL, 0, 0, 0); CDC_addStandardOptions(newBSC, options); @@ -771,8 +771,8 @@ CDC_LPL_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newLPL = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("vendor", (ModelNode*) newLPL, VISIBLE_STRING_255, IEC61850_FC_DC, 0, 0, 0); - DataAttribute_create("swRev", (ModelNode*) newLPL, VISIBLE_STRING_255, IEC61850_FC_DC, 0, 0, 0); + DataAttribute_create("vendor", (ModelNode*) newLPL, IEC61850_VISIBLE_STRING_255, IEC61850_FC_DC, 0, 0, 0); + DataAttribute_create("swRev", (ModelNode*) newLPL, IEC61850_VISIBLE_STRING_255, IEC61850_FC_DC, 0, 0, 0); CDC_addStandardOptions(newLPL, options); @@ -785,27 +785,27 @@ CDC_ACD_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newACD = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("general", (ModelNode*) newACD, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("dirGeneral", (ModelNode*) newACD, ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("general", (ModelNode*) newACD, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("dirGeneral", (ModelNode*) newACD, IEC61850_ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_PHASE_A) { - DataAttribute_create("phsA", (ModelNode*) newACD, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("dirPhsA", (ModelNode*) newACD, ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("phsA", (ModelNode*) newACD, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("dirPhsA", (ModelNode*) newACD, IEC61850_ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); } if (options & CDC_OPTION_PHASE_B) { - DataAttribute_create("phsB", (ModelNode*) newACD, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("dirPhsB", (ModelNode*) newACD, ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("phsB", (ModelNode*) newACD, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("dirPhsB", (ModelNode*) newACD, IEC61850_ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); } if (options & CDC_OPTION_PHASE_C) { - DataAttribute_create("phsC", (ModelNode*) newACD, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("dirPhsC", (ModelNode*) newACD, ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("phsC", (ModelNode*) newACD, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("dirPhsC", (ModelNode*) newACD, IEC61850_ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); } if (options & CDC_OPTION_PHASE_NEUT) { - DataAttribute_create("neut", (ModelNode*) newACD, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); - DataAttribute_create("dirNeut", (ModelNode*) newACD, ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("neut", (ModelNode*) newACD, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("dirNeut", (ModelNode*) newACD, IEC61850_ENUMERATED, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); } CDC_addTimeQuality(newACD, IEC61850_FC_ST); @@ -820,19 +820,19 @@ CDC_ACT_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newACT = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("general", (ModelNode*) newACT, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("general", (ModelNode*) newACT, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_PHASE_A) - DataAttribute_create("phsA", (ModelNode*) newACT, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("phsA", (ModelNode*) newACT, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_PHASE_B) - DataAttribute_create("phsB", (ModelNode*) newACT, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("phsB", (ModelNode*) newACT, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_PHASE_C) - DataAttribute_create("phsC", (ModelNode*) newACT, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("phsC", (ModelNode*) newACT, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_PHASE_NEUT) - DataAttribute_create("neut", (ModelNode*) newACT, BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("neut", (ModelNode*) newACT, IEC61850_BOOLEAN, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addTimeQuality(newACT, IEC61850_FC_ST); @@ -856,7 +856,7 @@ CDC_WYE_create(const char* dataObjectName, ModelNode* parent, uint32_t options) CDC_CMV_create("res", (ModelNode*) newWYE, options); if (options & CDC_OPTION_ANGLE_REF) - DataAttribute_create("angRef", (ModelNode*) newWYE, ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("angRef", (ModelNode*) newWYE, IEC61850_ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addStandardOptions(newWYE, options); @@ -875,7 +875,7 @@ CDC_DEL_create(const char* dataObjectName, ModelNode* parent, uint32_t options) CDC_CMV_create("phsCA", (ModelNode*) newDEL, options); if (options & CDC_OPTION_ANGLE_REF) - DataAttribute_create("angRef", (ModelNode*) newDEL, ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("angRef", (ModelNode*) newDEL, IEC61850_ENUMERATED, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addStandardOptions(newDEL, options); @@ -888,7 +888,7 @@ CDC_SPG_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newSPG = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("setVal", (ModelNode*) newSPG, BOOLEAN, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("setVal", (ModelNode*) newSPG, IEC61850_BOOLEAN, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addStandardOptions(newSPG, options); @@ -900,7 +900,7 @@ CDC_ENG_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newENG = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("setVal", (ModelNode*) newENG, ENUMERATED, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("setVal", (ModelNode*) newENG, IEC61850_ENUMERATED, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addStandardOptions(newENG, options); @@ -912,19 +912,19 @@ CDC_ING_create(const char* dataObjectName, ModelNode* parent, uint32_t options) { DataObject* newING = DataObject_create(dataObjectName, parent, 0); - DataAttribute_create("setVal", (ModelNode*) newING, INT32, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("setVal", (ModelNode*) newING, IEC61850_INT32, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_UNIT) CAC_Unit_create("units", (ModelNode*) newING, options & CDC_OPTION_UNIT_MULTIPLIER); if (options & CDC_OPTION_MIN) - DataAttribute_create("minVal", (ModelNode*) newING, INT32, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("minVal", (ModelNode*) newING, IEC61850_INT32, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_MAX) - DataAttribute_create("maxVal", (ModelNode*) newING, INT32, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("maxVal", (ModelNode*) newING, IEC61850_INT32, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); if (options & CDC_OPTION_STEP_SIZE) - DataAttribute_create("stepSize", (ModelNode*) newING, INT32U, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("stepSize", (ModelNode*) newING, IEC61850_INT32U, IEC61850_FC_SP, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addStandardOptions(newING, options); @@ -997,10 +997,10 @@ CDC_SPV_create(const char* dataObjectName, ModelNode* parent, uint32_t options, CAC_AnalogueValue_create("maxVal", (ModelNode*) newSPV, IEC61850_FC_CF, TRG_OPT_DATA_CHANGED, false); if (wpOptions & CDC_OPTION_61400_SP_ACS) - DataAttribute_create("spAcs", (ModelNode*) newSPV, CODEDENUM, IEC61850_FC_CF, 0, 0, 0); + DataAttribute_create("spAcs", (ModelNode*) newSPV, IEC61850_CODEDENUM, IEC61850_FC_CF, 0, 0, 0); if (wpOptions & CDC_OPTION_61400_CHA_PER_RS) - DataAttribute_create("chaPerRs", (ModelNode*) newSPV, CODEDENUM, IEC61850_FC_CF, 0, 0, 0); + DataAttribute_create("chaPerRs", (ModelNode*) newSPV, IEC61850_CODEDENUM, IEC61850_FC_CF, 0, 0, 0); CDC_addStandardOptions(newSPV, options); @@ -1064,7 +1064,7 @@ CDC_CMD_create(const char* dataObjectName, ModelNode* parent, CDC_INS_create("oldSt", (ModelNode*) newCMD, 0); if (wpOptions & CDC_OPTION_61400_CM_ACS) - DataAttribute_create("cmAcs", (ModelNode*) newCMD, INT8U, IEC61850_FC_CF, 0, 0, 0); + DataAttribute_create("cmAcs", (ModelNode*) newCMD, IEC61850_INT8U, IEC61850_FC_CF, 0, 0, 0); CDC_addStandardOptions(newCMD, options); @@ -1094,19 +1094,19 @@ CDC_CTE_create(const char* dataObjectName, ModelNode* parent, CDC_INS_create("oldCtVal", (ModelNode*) newCTE, 0); if (wpOptions & CDC_OPTION_61400_TM_TOT) - DataAttribute_create("ctTot", (ModelNode*) newCTE, INT32U, IEC61850_FC_ST, 0, 0, 0); + DataAttribute_create("ctTot", (ModelNode*) newCTE, IEC61850_INT32U, IEC61850_FC_ST, 0, 0, 0); if (wpOptions & CDC_OPTION_61400_COUNTING_DAILY) - DataAttribute_create("dly", (ModelNode*) newCTE, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 32, 0); + DataAttribute_create("dly", (ModelNode*) newCTE, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 32, 0); if (wpOptions & CDC_OPTION_61400_COUNTING_MONTHLY) - DataAttribute_create("mly", (ModelNode*) newCTE, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 13, 0); + DataAttribute_create("mly", (ModelNode*) newCTE, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 13, 0); if (wpOptions & CDC_OPTION_61400_COUNTING_YEARLY) - DataAttribute_create("mly", (ModelNode*) newCTE, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 21, 0); + DataAttribute_create("mly", (ModelNode*) newCTE, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 21, 0); if (wpOptions & CDC_OPTION_61400_COUNTING_TOTAL) - DataAttribute_create("tot", (ModelNode*) newCTE, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("tot", (ModelNode*) newCTE, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addStandardOptions(newCTE, options); @@ -1133,19 +1133,19 @@ CDC_TMS_create(const char* dataObjectName, ModelNode* parent, CDC_INS_create("oldTmVal", (ModelNode*) newTMS, 0); if (wpOptions & CDC_OPTION_61400_TM_TOT) - DataAttribute_create("tmTot", (ModelNode*) newTMS, INT32U, IEC61850_FC_ST, 0, 0, 0); + DataAttribute_create("tmTot", (ModelNode*) newTMS, IEC61850_INT32U, IEC61850_FC_ST, 0, 0, 0); if (wpOptions & CDC_OPTION_61400_COUNTING_DAILY) - DataAttribute_create("dly", (ModelNode*) newTMS, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 32, 0); + DataAttribute_create("dly", (ModelNode*) newTMS, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 32, 0); if (wpOptions & CDC_OPTION_61400_COUNTING_MONTHLY) - DataAttribute_create("mly", (ModelNode*) newTMS, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 13, 0); + DataAttribute_create("mly", (ModelNode*) newTMS, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 13, 0); if (wpOptions & CDC_OPTION_61400_COUNTING_YEARLY) - DataAttribute_create("mly", (ModelNode*) newTMS, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 21, 0); + DataAttribute_create("mly", (ModelNode*) newTMS, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 21, 0); if (wpOptions & CDC_OPTION_61400_COUNTING_TOTAL) - DataAttribute_create("tot", (ModelNode*) newTMS, INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); + DataAttribute_create("tot", (ModelNode*) newTMS, IEC61850_INT32U, IEC61850_FC_ST, TRG_OPT_DATA_CHANGED, 0, 0); CDC_addStandardOptions(newTMS, options); diff --git a/src/iec61850/server/model/config_file_parser.c b/src/iec61850/server/model/config_file_parser.c index fef92d37..1157ec6a 100644 --- a/src/iec61850/server/model/config_file_parser.c +++ b/src/iec61850/server/model/config_file_parser.c @@ -292,7 +292,7 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle) if (valueIndicator != NULL) { switch (dataAttribute->type) { - case UNICODE_STRING_255: + case IEC61850_UNICODE_STRING_255: { char* stringStart = valueIndicator + 2; terminateString(stringStart, '"'); @@ -300,11 +300,11 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle) } break; - case VISIBLE_STRING_255: - case VISIBLE_STRING_129: - case VISIBLE_STRING_65: - case VISIBLE_STRING_64: - case VISIBLE_STRING_32: + case IEC61850_VISIBLE_STRING_255: + case IEC61850_VISIBLE_STRING_129: + case IEC61850_VISIBLE_STRING_65: + case IEC61850_VISIBLE_STRING_64: + case IEC61850_VISIBLE_STRING_32: { char* stringStart = valueIndicator + 2; terminateString(stringStart, '"'); @@ -312,12 +312,12 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle) } break; - case INT8: - case INT16: - case INT32: - case INT64: - case INT128: - case ENUMERATED: + case IEC61850_INT8: + case IEC61850_INT16: + case IEC61850_INT32: + case IEC61850_INT64: + case IEC61850_INT128: + case IEC61850_ENUMERATED: { int32_t intValue; if (sscanf(valueIndicator + 1, "%i", &intValue) != 1) goto exit_error; @@ -325,10 +325,10 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle) } break; - case INT8U: - case INT16U: - case INT24U: - case INT32U: + case IEC61850_INT8U: + case IEC61850_INT16U: + case IEC61850_INT24U: + case IEC61850_INT32U: { uint32_t uintValue; if (sscanf(valueIndicator + 1, "%u", &uintValue) != 1) goto exit_error; @@ -336,7 +336,7 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle) } break; - case FLOAT32: + case IEC61850_FLOAT32: { float floatValue; if (sscanf(valueIndicator + 1, "%f", &floatValue) != 1) goto exit_error; @@ -344,7 +344,7 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle) } break; - case FLOAT64: + case IEC61850_FLOAT64: { double doubleValue; if (sscanf(valueIndicator + 1, "%lf", &doubleValue) != 1) goto exit_error; @@ -352,7 +352,7 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle) } break; - case BOOLEAN: + case IEC61850_BOOLEAN: { int boolean; if (sscanf(valueIndicator + 1, "%i", &boolean) != 1) goto exit_error; diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar index 28621fac..2fdd70a9 100644 Binary files a/tools/model_generator/genmodel.jar and b/tools/model_generator/genmodel.jar differ diff --git a/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java b/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java index c35b8392..b1ed816e 100644 --- a/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java +++ b/tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java @@ -539,7 +539,7 @@ public class StaticModelGenerator { cOut.println(" " + dataAttribute.getCount() + ","); cOut.println(" IEC61850_FC_" + dataAttribute.getFc().toString() + ","); - cOut.println(" " + dataAttribute.getType() + ","); + cOut.println(" IEC61850_" + dataAttribute.getType() + ","); /* print trigger options */ cOut.print(" 0");