RYTEC
/
libiec61850
mirror of https://github.com/mz-automation/libiec61850.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix examples with new API

Browse Source
pull/35/head
Steffen Vogel 8 years ago
parent 73cdb5a0f7
commit 819bb67d6d
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File

36
examples/iec61850_9_2_LE_example/iec61850_9_2_LE_example.c
Unescape Escape View File

@ -54,7 +54,7 @@ static int vol3;
static int vol4; static int vol4;
static SVPublisher svPublisher; static SVPublisher svPublisher;
static SV_ASDU asdu; static SVPublisher_ASDU asdu;
static void static void
setupSVPublisher(const char* svInterface) setupSVPublisher(const char* svInterface)
@ -63,15 +63,15 @@ setupSVPublisher(const char* svInterface)
asdu = SVPublisher_addASDU(svPublisher, "xxxxMUnn01", NULL, 1); asdu = SVPublisher_addASDU(svPublisher, "xxxxMUnn01", NULL, 1);
amp1 = SV_ASDU_addINT32(asdu); amp1 = SVPublisher_ASDU_addINT32(asdu);
amp2 = SV_ASDU_addINT32(asdu); amp2 = SVPublisher_ASDU_addINT32(asdu);
amp3 = SV_ASDU_addINT32(asdu); amp3 = SVPublisher_ASDU_addINT32(asdu);
amp4 = SV_ASDU_addINT32(asdu); amp4 = SVPublisher_ASDU_addINT32(asdu);
vol1 = SV_ASDU_addINT32(asdu); vol1 = SVPublisher_ASDU_addINT32(asdu);
vol2 = SV_ASDU_addINT32(asdu); vol2 = SVPublisher_ASDU_addINT32(asdu);
vol3 = SV_ASDU_addINT32(asdu); vol3 = SVPublisher_ASDU_addINT32(asdu);
vol4 = SV_ASDU_addINT32(asdu); vol4 = SVPublisher_ASDU_addINT32(asdu);
SVPublisher_setupComplete(svPublisher); SVPublisher_setupComplete(svPublisher);
} }
@ -143,17 +143,17 @@ main(int argc, char** argv)
if (svcbEnabled) { if (svcbEnabled) {
SV_ASDU_setINT32(asdu, amp1, current); SVPublisher_ASDU_setINT32(asdu, amp1, current);
SV_ASDU_setINT32(asdu, amp2, current); SVPublisher_ASDU_setINT32(asdu, amp2, current);
SV_ASDU_setINT32(asdu, amp3, current); SVPublisher_ASDU_setINT32(asdu, amp3, current);
SV_ASDU_setINT32(asdu, amp4, current); SVPublisher_ASDU_setINT32(asdu, amp4, current);
SV_ASDU_setINT32(asdu, vol1, voltage); SVPublisher_ASDU_setINT32(asdu, vol1, voltage);
SV_ASDU_setINT32(asdu, vol2, voltage); SVPublisher_ASDU_setINT32(asdu, vol2, voltage);
SV_ASDU_setINT32(asdu, vol3, voltage); SVPublisher_ASDU_setINT32(asdu, vol3, voltage);
SV_ASDU_setINT32(asdu, vol4, voltage); SVPublisher_ASDU_setINT32(asdu, vol4, voltage);
SV_ASDU_increaseSmpCnt(asdu); SVPublisher_ASDU_increaseSmpCnt(asdu);
SVPublisher_publish(svPublisher); SVPublisher_publish(svPublisher);
} }

20
examples/sv_publisher/sv_publisher_example.c
Unescape Escape View File

@ -31,15 +31,15 @@ main(int argc, char** argv)
SVPublisher svPublisher = SVPublisher_create(NULL, interface); SVPublisher svPublisher = SVPublisher_create(NULL, interface);
SV_ASDU asdu1 = SVPublisher_addASDU(svPublisher, "svpub1", NULL, 1); SVPublisher_ASDU asdu1 = SVPublisher_addASDU(svPublisher, "svpub1", NULL, 1);
int float1 = SV_ASDU_addFLOAT(asdu1); int float1 = SVPublisher_ASDU_addFLOAT(asdu1);
int float2 = SV_ASDU_addFLOAT(asdu1); int float2 = SVPublisher_ASDU_addFLOAT(asdu1);
SV_ASDU asdu2 = SVPublisher_addASDU(svPublisher, "svpub2", NULL, 1); SVPublisher_ASDU asdu2 = SVPublisher_addASDU(svPublisher, "svpub2", NULL, 1);
int float3 = SV_ASDU_addFLOAT(asdu2); int float3 = SVPublisher_ASDU_addFLOAT(asdu2);
int float4 = SV_ASDU_addFLOAT(asdu2); int float4 = SVPublisher_ASDU_addFLOAT(asdu2);
SVPublisher_setupComplete(svPublisher); SVPublisher_setupComplete(svPublisher);
@ -49,11 +49,11 @@ main(int argc, char** argv)
int i; int i;
while (running) { while (running) {
SV_ASDU_setFLOAT(asdu1, float1, fVal1); SVPublisher_ASDU_setFLOAT(asdu1, float1, fVal1);
SV_ASDU_setFLOAT(asdu1, float2, fVal2); SVPublisher_ASDU_setFLOAT(asdu1, float2, fVal2);
SV_ASDU_increaseSmpCnt(asdu1); SVPublisher_ASDU_increaseSmpCnt(asdu1);
SV_ASDU_increaseSmpCnt(asdu2); SVPublisher_ASDU_increaseSmpCnt(asdu2);
fVal1 += 1.1f; fVal1 += 1.1f;
fVal2 += 0.1f; fVal2 += 0.1f;

14
examples/sv_subscriber/sv_subscriber_example.c
Unescape Escape View File

@ -21,17 +21,17 @@ void sigint_handler(int signalId)
/* Callback handler for received SV messages */ /* Callback handler for received SV messages */
static void static void
svUpdateListener (SVSubscriber subscriber, void* parameter, SVClientASDU asdu) svUpdateListener (SVSubscriber subscriber, void* parameter, SVSubscriber_ASDU asdu)
{ {
printf("svUpdateListener called\n"); printf("svUpdateListener called\n");
const char* svID = SVClientASDU_getSvId(asdu); const char* svID = SVSubscriber_ASDU_getSvId(asdu);
if (svID != NULL) if (svID != NULL)
printf(" svID=(%s)\n", svID); printf(" svID=(%s)\n", svID);
printf(" smpCnt: %i\n", SVClientASDU_getSmpCnt(asdu)); printf(" smpCnt: %i\n", SVSubscriber_ASDU_getSmpCnt(asdu));
printf(" confRev: %u\n", SVClientASDU_getConfRev(asdu)); printf(" confRev: %u\n", SVSubscriber_ASDU_getConfRev(asdu));
/* /*
* Access to the data requires a priori knowledge of the data set. * Access to the data requires a priori knowledge of the data set.
@ -43,9 +43,9 @@ svUpdateListener (SVSubscriber subscriber, void* parameter, SVClientASDU asdu)
* To prevent damages due configuration, please check the length of the * To prevent damages due configuration, please check the length of the
* data block of the SV message before accessing the data. * data block of the SV message before accessing the data.
*/ */
if (SVClientASDU_getDataSize(asdu) >= 8) { if (SVSubscriber_ASDU_getDataSize(asdu) >= 8) {
printf(" DATA[0]: %f\n", SVClientASDU_getFLOAT32(asdu, 0)); printf(" DATA[0]: %f\n", SVSubscriber_ASDU_getFLOAT32(asdu, 0));
printf(" DATA[1]: %f\n", SVClientASDU_getFLOAT32(asdu, 4)); printf(" DATA[1]: %f\n", SVSubscriber_ASDU_getFLOAT32(asdu, 4));
} }
} }

Write Preview
Loading…
Cancel
Save