iec61850_client_example_reporting: revert changes from MMS server potential crash fix

The commit 0d4930ac25 renamed the RCB values
from "testmodelSENSORS/LLN0.RP.events01" to "simpleIOGenericIO/LLN0.RP.EventsRCB01"
with other changes.

But since "testmodelSENSORS" doesn't exist on the server_example_basic_io
the program fail with:

Reading data set directory failed!
failed to read dataset
getRCBValues service error!

Revert all testmodelSENSORS related changes with the previous code.
Now we get the two report as expected:

received report for simpleIOGenericIO/LLN0.RP.EventsRCB with rptId Events1
  report contains timestamp (1596190789): Fri Jul 31 12:19:49 2020
  simpleIOGenericIO/GGIO1.SPCSO1.stVal[ST] (included for reason 16): false
  simpleIOGenericIO/GGIO1.SPCSO2.stVal[ST] (included for reason 16): false
  simpleIOGenericIO/GGIO1.SPCSO3.stVal[ST] (included for reason 16): false
  simpleIOGenericIO/GGIO1.SPCSO4.stVal[ST] (included for reason 16): false

received report for simpleIOGenericIO/LLN0.RP.EventsRCB with rptId Events1
  report contains timestamp (1596190790): Fri Jul 31 12:19:50 2020
  simpleIOGenericIO/GGIO1.SPCSO1.stVal[ST] (included for reason 16): false
  simpleIOGenericIO/GGIO1.SPCSO2.stVal[ST] (included for reason 16): false
  simpleIOGenericIO/GGIO1.SPCSO3.stVal[ST] (included for reason 16): false
  simpleIOGenericIO/GGIO1.SPCSO4.stVal[ST] (included for reason 16): false

Signed-off-by: Romain Naour <romain.naour@smile.fr>
pull/246/head
Romain Naour 5 years ago
parent 004789cf39
commit 1c2db6e3be

@ -103,7 +103,7 @@ main(int argc, char** argv)
LinkedList dataSetDirectory = NULL;
/* read data set directory */
dataSetDirectory = IedConnection_getDataSetDirectory(con, &error, "testmodelSENSORS/LLN0.DataSetST_Attr", NULL);
dataSetDirectory = IedConnection_getDataSetDirectory(con, &error, "simpleIOGenericIO/LLN0.Events", NULL);
if (error != IED_ERROR_OK) {
printf("Reading data set directory failed!\n");
@ -111,7 +111,7 @@ main(int argc, char** argv)
}
/* read data set */
clientDataSet = IedConnection_readDataSetValues(con, &error, "testmodelSENSORS/LLN0.DataSetST_Attr", NULL);
clientDataSet = IedConnection_readDataSetValues(con, &error, "simpleIOGenericIO/LLN0.Events", NULL);
if (clientDataSet == NULL) {
printf("failed to read dataset\n");
@ -119,7 +119,7 @@ main(int argc, char** argv)
}
/* Read RCB values */
rcb = IedConnection_getRCBValues(con, &error, "testmodelSENSORS/LLN0.RP.events01", NULL);
rcb = IedConnection_getRCBValues(con, &error, "simpleIOGenericIO/LLN0.RP.EventsRCB01", NULL);
if (error != IED_ERROR_OK) {
printf("getRCBValues service error!\n");
@ -129,12 +129,12 @@ main(int argc, char** argv)
/* prepare the parameters of the RCP */
ClientReportControlBlock_setResv(rcb, true);
ClientReportControlBlock_setTrgOps(rcb, TRG_OPT_DATA_CHANGED | TRG_OPT_QUALITY_CHANGED | TRG_OPT_GI);
ClientReportControlBlock_setDataSetReference(rcb, "testmodelSENSORS/LLN0$DataSetST_Attr"); /* NOTE the "$" instead of "." ! */
ClientReportControlBlock_setDataSetReference(rcb, "simpleIOGenericIO/LLN0$Events"); /* NOTE the "$" instead of "." ! */
ClientReportControlBlock_setRptEna(rcb, true);
ClientReportControlBlock_setGI(rcb, true);
/* Configure the report receiver */
IedConnection_installReportHandler(con, "testmodelSENSORS/LLN0.events01", ClientReportControlBlock_getRptId(rcb), reportCallbackFunction,
IedConnection_installReportHandler(con, "simpleIOGenericIO/LLN0.RP.EventsRCB", ClientReportControlBlock_getRptId(rcb), reportCallbackFunction,
(void*) dataSetDirectory);
/* Write RCB parameters and enable report */

Loading…
Cancel
Save