diff --git a/include/villas/nodes/iec61850.hpp b/include/villas/nodes/iec61850.hpp index 705b45cea..253c15331 100644 --- a/include/villas/nodes/iec61850.hpp +++ b/include/villas/nodes/iec61850.hpp @@ -43,6 +43,11 @@ #include #include +#include + +#ifndef CONFIG_GOOSE_DEFAULT_DST_ADDRESS + #define CONFIG_GOOSE_DEFAULT_DST_ADDRESS {0x01, 0x0c, 0xcd, 0x01, 0x00, 0x01} +#endif /* Forward declarations */ struct vnode; diff --git a/lib/nodes/iec61850_sv.cpp b/lib/nodes/iec61850_sv.cpp index b79b648f1..a854f8182 100644 --- a/lib/nodes/iec61850_sv.cpp +++ b/lib/nodes/iec61850_sv.cpp @@ -20,12 +20,11 @@ * along with this program. If not, see . *********************************************************************************/ -#if CONFIG_IEC61850_SAMPLED_VALUES_SUPPORT == 1 - #include #include #include +#include #include #define CONFIG_SV_DEFAULT_APPID 0x4000 @@ -52,7 +51,7 @@ static void iec61850_sv_listener(SVSubscriber subscriber, void *ctx, SVSubscribe sz = SVSubscriber_ASDU_getDataSize(asdu); if (sz < i->in.total_size) { - n->node->warn("Received truncated ASDU: size={}, expected={}", SVSubscriber_ASDU_getDataSize(asdu), i->in.total_size); + n->logger->warn("Received truncated ASDU: size={}, expected={}", SVSubscriber_ASDU_getDataSize(asdu), i->in.total_size); return; } @@ -483,8 +482,8 @@ static void register_plugin() { p.description = "IEC 61850-9-2 (Sampled Values)"; p.vectorize = 0; p.size = sizeof(struct iec61850_sv); - p.start = iec61850_type_start; - p.stop = iec61850_type_stop; + p.type.start = iec61850_type_start; + p.type.stop = iec61850_type_stop; p.destroy = iec61850_sv_destroy; p.parse = iec61850_sv_parse; p.print = iec61850_sv_print; @@ -499,5 +498,3 @@ static void register_plugin() { node_types->push_back(&p); } - -#endif /* CONFIG_IEC61850_SAMPLED_VALUES_SUPPORT */