Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

iec61850-9-2: some fixes for previous commit

Browse source
This commit is contained in:
Steffen Vogel 2018-04-04 12:00:50 +02:00
parent b811c8248d
commit 526603fc45
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/villas/nodes/iec61850_sv.h
View file

@ -46,6 +46,8 @@ struct iec61850_sv {
struct ether_addr dst_address;
struct {
bool enabled;
SVSubscriber subscriber;
SVReceiver receiver;
@ -57,6 +59,8 @@ struct iec61850_sv {
} subscriber;
struct {
bool enabled;
SVPublisher publisher;
SVPublisher_ASDU asdu;

45
lib/nodes/iec61850_sv.c
View file

@ -22,7 +22,7 @@
#include <libiec61850/stack_config.h>
//#if CONFIG_IEC61850_SAMPLED_VALUES_SUPPORT == 1
#if CONFIG_IEC61850_SAMPLED_VALUES_SUPPORT == 1
#include <string.h>
#include <pthread.h>
@ -254,33 +254,34 @@ int iec61850_sv_start(struct node *n)
struct iec61850_sv *i = (struct iec61850_sv *) n->_vd;
/* Initialize publisher */
i->publisher.publisher = SVPublisher_create(NULL, i->interface);
i->publisher.asdu = SVPublisher_addASDU(i->publisher.publisher, i->publisher.svid, node_name_short(n), i->publisher.confrev);
if (i->publisher.enabled) {
i->publisher.publisher = SVPublisher_create(NULL, i->interface);
i->publisher.asdu = SVPublisher_addASDU(i->publisher.publisher, i->publisher.svid, node_name_short(n), i->publisher.confrev);
for (unsigned k = 0; k < list_length(&i->publisher.mapping); k++) {
struct iec61850_type_descriptor *m = (struct iec61850_type_descriptor *) list_at(&i->publisher.mapping, k);
for (unsigned k = 0; k < list_length(&i->publisher.mapping); k++) {
struct iec61850_type_descriptor *m = (struct iec61850_type_descriptor *) list_at(&i->publisher.mapping, k);
switch (m->type) {
case IEC61850_TYPE_INT8: SVPublisher_ASDU_addINT8(i->publisher.asdu); break;
case IEC61850_TYPE_INT32: SVPublisher_ASDU_addINT32(i->publisher.asdu); break;
case IEC61850_TYPE_FLOAT32: SVPublisher_ASDU_addFLOAT(i->publisher.asdu); break;
case IEC61850_TYPE_FLOAT64: SVPublisher_ASDU_addFLOAT64(i->publisher.asdu); break;
default: { }
switch (m->type) {
case IEC61850_TYPE_INT8: SVPublisher_ASDU_addINT8(i->publisher.asdu); break;
case IEC61850_TYPE_INT32: SVPublisher_ASDU_addINT32(i->publisher.asdu); break;
case IEC61850_TYPE_FLOAT32: SVPublisher_ASDU_addFLOAT(i->publisher.asdu); break;
case IEC61850_TYPE_FLOAT64: SVPublisher_ASDU_addFLOAT64(i->publisher.asdu); break;
default: { }
}
}
if (i->publisher.smpmod >= 0)
SVPublisher_ASDU_setSmpMod(i->publisher.asdu, i->publisher.smpmod);
// if (s->publisher.smprate >= 0)
// SV_ASDU_setSmpRate(i->publisher.asdu, i->publisher.smprate);
/* Start publisher */
SVPublisher_setupComplete(i->publisher.publisher);
}
if (i->publisher.smpmod >= 0)
SVPublisher_ASDU_setSmpMod(i->publisher.asdu, i->publisher.smpmod);
// if (s->publisher.smprate >= 0)
// SV_ASDU_setSmpRate(i->publisher.asdu, i->publisher.smprate);
/* Start publisher */
if (i->publisher.enabled)
SVPublisher_setupComplete(i->publisher.publisher);
/* Start subscriber */
if (i->publisher.enabled) {
if (i->subscriber.enabled) {
struct iec61850_receiver *r = iec61850_receiver_create(IEC61850_RECEIVER_SV, i->interface);
i->subscriber.receiver = r->sv;