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

treat missing ioa as increase of previous one

Browse source
This commit is contained in:
Philipp Jungkamp 2022-07-14 11:13:27 +00:00
parent 5be220a857
commit 9cbb96ddb5
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/villas/nodes/iec60870.hpp
View file

@ -73,7 +73,7 @@ public:
};
// parse the config json
static ASDUData parse(json_t *signal_json);
static ASDUData parse(json_t *signal_json, std::optional<int> last_ioa);
// lookup datatype for config key asdu_type
static std::optional<ASDUData> lookupName(char const *name, bool with_timestamp, int ioa);
// lookup datatype for config key asdu_type_id
@ -133,7 +133,6 @@ class SlaveNode : public Node {
protected:
bool debug = true;
struct Server {
// slave state
enum { NONE, STOPPED, READY } state = NONE;

18
lib/nodes/iec60870.cpp
View file

@ -50,14 +50,14 @@ timespec cp56time2a_to_timespec(CP56Time2a cp56time2a) {
return time;
}
ASDUData ASDUData::parse(json_t *signal_json) {
ASDUData ASDUData::parse(json_t *signal_json, std::optional<int> last_ioa) {
json_error_t err;
char const *asdu_type_name = nullptr;
int with_timestamp = -1;
char const *asdu_type_id = nullptr;
int ioa = 0;
int ioa = -1;
if (json_unpack_ex(signal_json, &err, 0, "{ s?: s, s?: b, s?: s, s: i }",
if (json_unpack_ex(signal_json, &err, 0, "{ s?: s, s?: b, s?: s, s?: i }",
"asdu_type", &asdu_type_name,
"with_timestamp", &with_timestamp,
"asdu_type_id", &asdu_type_id,
@ -67,8 +67,12 @@ ASDUData ASDUData::parse(json_t *signal_json) {
with_timestamp = with_timestamp != -1 ? with_timestamp != 0 : false;
if (ioa == 0)
throw RuntimeError("Found invalid ioa {} in config", ioa);
if (ioa == -1) {
if (last_ioa)
ioa = *last_ioa;
else
throw RuntimeError("Missing ioa for signal", ioa);
}
if ( (asdu_type_name && asdu_type_id) ||
(!asdu_type_name && !asdu_type_id))
@ -613,9 +617,11 @@ int SlaveNode::parse(json_t *json, const uuid_t sn_uuid)
if (signals_json) {
json_t *signal_json;
size_t i;
std::optional<int> last_ioa = std::nullopt;
json_array_foreach(signals_json, i, signal_json) {
auto signal = signals ? signals->getByIndex(i) : Signal::Ptr{};
auto asdu_data = ASDUData::parse(signal_json);
auto asdu_data = ASDUData::parse(signal_json, last_ioa);
last_ioa = asdu_data.ioa;
SignalData initial_value;
if (signal) {
if (signal->type != asdu_data.signalType())