updated sampled values examples to use new naming

pull/35/head
Steffen Vogel 8 years ago
parent f1163e78db
commit eb3be133f6

@ -53,15 +53,15 @@ static int vol2;
static int vol3; static int vol3;
static int vol4; static int vol4;
static SampledValuesPublisher svPublisher; static SVPublisher svPublisher;
static SV_ASDU asdu; static SV_ASDU asdu;
static void static void
setupSVPublisher(const char* svInterface) setupSVPublisher(const char* svInterface)
{ {
svPublisher = SampledValuesPublisher_create(NULL, svInterface); svPublisher = SVPublisher_create(NULL, svInterface);
asdu = SampledValuesPublisher_addASDU(svPublisher, "xxxxMUnn01", NULL, 1); asdu = SVPublisher_addASDU(svPublisher, "xxxxMUnn01", NULL, 1);
amp1 = SV_ASDU_addINT32(asdu); amp1 = SV_ASDU_addINT32(asdu);
amp2 = SV_ASDU_addINT32(asdu); amp2 = SV_ASDU_addINT32(asdu);
@ -73,7 +73,7 @@ setupSVPublisher(const char* svInterface)
vol3 = SV_ASDU_addINT32(asdu); vol3 = SV_ASDU_addINT32(asdu);
vol4 = SV_ASDU_addINT32(asdu); vol4 = SV_ASDU_addINT32(asdu);
SampledValuesPublisher_setupComplete(svPublisher); SVPublisher_setupComplete(svPublisher);
} }
static void sVCBEventHandler (SVControlBlock* svcb, int event, void* parameter) static void sVCBEventHandler (SVControlBlock* svcb, int event, void* parameter)
@ -155,7 +155,7 @@ main(int argc, char** argv)
SV_ASDU_increaseSmpCnt(asdu); SV_ASDU_increaseSmpCnt(asdu);
SampledValuesPublisher_publish(svPublisher); SVPublisher_publish(svPublisher);
} }
voltage++; voltage++;
@ -168,7 +168,7 @@ main(int argc, char** argv)
IedServer_stop(iedServer); IedServer_stop(iedServer);
/* Cleanup - free all resources */ /* Cleanup - free all resources */
SampledValuesPublisher_destroy(svPublisher); SVPublisher_destroy(svPublisher);
IedServer_destroy(iedServer); IedServer_destroy(iedServer);
return 0; return 0;

@ -29,19 +29,19 @@ main(int argc, char** argv)
printf("Using interface %s\n", interface); printf("Using interface %s\n", interface);
SampledValuesPublisher svPublisher = SampledValuesPublisher_create(NULL, interface); SVPublisher svPublisher = SVPublisher_create(NULL, interface);
SV_ASDU asdu1 = SampledValuesPublisher_addASDU(svPublisher, "svpub1", NULL, 1); SV_ASDU asdu1 = SVPublisher_addASDU(svPublisher, "svpub1", NULL, 1);
int float1 = SV_ASDU_addFLOAT(asdu1); int float1 = SV_ASDU_addFLOAT(asdu1);
int float2 = SV_ASDU_addFLOAT(asdu1); int float2 = SV_ASDU_addFLOAT(asdu1);
SV_ASDU asdu2 = SampledValuesPublisher_addASDU(svPublisher, "svpub2", NULL, 1); SV_ASDU asdu2 = SVPublisher_addASDU(svPublisher, "svpub2", NULL, 1);
int float3 = SV_ASDU_addFLOAT(asdu2); int float3 = SV_ASDU_addFLOAT(asdu2);
int float4 = SV_ASDU_addFLOAT(asdu2); int float4 = SV_ASDU_addFLOAT(asdu2);
SampledValuesPublisher_setupComplete(svPublisher); SVPublisher_setupComplete(svPublisher);
float fVal1 = 1234.5678f; float fVal1 = 1234.5678f;
float fVal2 = 0.12345f; float fVal2 = 0.12345f;
@ -58,10 +58,10 @@ main(int argc, char** argv)
fVal1 += 1.1f; fVal1 += 1.1f;
fVal2 += 0.1f; fVal2 += 0.1f;
SampledValuesPublisher_publish(svPublisher); SVPublisher_publish(svPublisher);
Thread_sleep(50); Thread_sleep(50);
} }
SampledValuesPublisher_destroy(svPublisher); SVPublisher_destroy(svPublisher);
} }

Loading…
Cancel
Save