- changed configuration values of trgops to be identical to SCL value

Signed-off-by: Michael Zillgith <[email protected]>
fledge-power · Feb 12, 2024 · 0019471 · 0019471
1 parent 810b6d1
commit 0019471
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/src/iec61850_client_config.cpp b/src/iec61850_client_config.cpp
@@ -34,12 +34,11 @@
 using namespace rapidjson;
 
 static const std::unordered_map<std::string, int> trgOptions
-    = { { "data_changed", TRG_OPT_DATA_CHANGED },
-        { "quality_changed", TRG_OPT_QUALITY_CHANGED },
-        { "data_update", TRG_OPT_DATA_UPDATE },
-        { "integrity", TRG_OPT_INTEGRITY },
-        { "gi", TRG_OPT_GI },
-        { "transient", TRG_OPT_TRANSIENT } };
+    = { { "dchg", TRG_OPT_DATA_CHANGED },
+        { "qchg", TRG_OPT_QUALITY_CHANGED },
+        { "dupd", TRG_OPT_DATA_UPDATE },
+        { "period", TRG_OPT_INTEGRITY },
+        { "gi", TRG_OPT_GI } };
 
 static const std::unordered_map<std::string, CDCTYPE> cdcMap
     = { { "SpsTyp", SPS }, { "DpsTyp", DPS }, { "BscTyp", BSC },

diff --git a/tests/test_iec61850_config.cpp b/tests/test_iec61850_config.cpp
@@ -293,8 +293,8 @@ static string wrong_protocol_config_13 = QUOTE({
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsIndexed",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Events2",
                     "trgops" : [
-                        "data_changed",
-                        "quality_changed",
+                        "dchg",
+                        "qchg",
                         "gi"
                     ],
                     "gi" : false
@@ -325,8 +325,8 @@ static string wrong_protocol_config_14 = QUOTE({
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsIndexed",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Events2",
                     "trgops" : [
-                        "data_changed",
-                        "quality_changed",
+                        "dchg",
+                        "qchg",
                         "gi"
                     ],
                     "gi" : false
@@ -356,8 +356,8 @@ static string wrong_protocol_config_15 = QUOTE({
                 {
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsIndexed",
                     "trgops" : [
-                        "data_changed",
-                        "quality_changed",
+                        "dchg",
+                        "qchg",
                         "gi"
                     ],
                     "gi" : false
@@ -448,8 +448,8 @@ static string wrong_protocol_config_17 = QUOTE({
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsRCB",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Mags",
                     "trgops" : [
-                        "data_changed",
-                        "quality_changed"
+                        "dchg",
+                        "qchg"
                     ],
                     "buftm": 1,
                     "intgpd": 2
@@ -458,8 +458,8 @@ static string wrong_protocol_config_17 = QUOTE({
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsIndexed",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Events2",
                     "trgops" : [
-                        "data_changed",
-                        "quality_changed"
+                        "dchg",
+                        "qchg"
                     ],
                     "buftm": 1,
                     "intgpd": 2

diff --git a/tests/test_iec61850_reporting.cpp b/tests/test_iec61850_reporting.cpp
@@ -51,13 +51,13 @@ static string protocol_config = QUOTE ({
                 {
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsRCB01",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Mags",
-                    "trgops" : [ "data_changed", "quality_changed", "gi" ],
+                    "trgops" : [ "dchg", "qchg", "gi" ],
                     "gi" : false
                 },
                 {
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsIndexed01",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Events2",
-                    "trgops" : [ "data_changed", "quality_changed", "gi" ],
+                    "trgops" : [ "dchg", "qchg", "gi" ],
                     "gi" : false
                 }
             ]
@@ -106,13 +106,13 @@ static string protocol_config_2 = QUOTE ({
                 {
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsRCB01",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Mags",
-                    "trgops" : [ "data_changed", "quality_changed", "gi" ],
+                    "trgops" : [ "dchg", "qchg", "gi" ],
                     "gi" : true
                 },
                 {
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsIndexed01",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Events2",
-                    "trgops" : [ "data_changed", "quality_changed", "gi" ],
+                    "trgops" : [ "dchg", "qchg", "gi" ],
                     "gi" : true
                 }
             ]
@@ -148,7 +148,7 @@ static string protocol_config_3 = QUOTE ({
                 {
                     "rcb_ref" : "simpleIOGenericIO/LLN0.RP.EventsRCB01",
                     "dataset_ref" : "simpleIOGenericIO/LLN0.Mags",
-                    "trgops" : [ "data_changed", "quality_changed", "gi" ],
+                    "trgops" : [ "dchg", "qchg", "gi" ],
                     "gi" : false
                 }
             ]