1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00

signal: fix json encoding

This commit is contained in:
Steffen Vogel 2022-03-28 10:42:03 +02:00
parent b8e486af15
commit 9b9f880d18

View file

@ -81,16 +81,19 @@ int Signal::parse(json_t *json)
json_t * Signal::toJson() const
{
json_t *json_sig = json_pack("{ s: s, s: o }",
"type", signalTypeToString(type).c_str(),
"init", init.toJson(type)
json_t *json_sig = json_pack("{ s: s }",
"type", signalTypeToString(type).c_str()
);
auto *json_init = init.toJson(type);
if (json_init)
json_object_set_new(json_sig, "init", json_init);
if (!name.empty())
json_object_set(json_sig, "name", json_string(name.c_str()));
json_object_set_new(json_sig, "name", json_string(name.c_str()));
if (!unit.empty())
json_object_set(json_sig, "unit", json_string(unit.c_str()));
json_object_set_new(json_sig, "unit", json_string(unit.c_str()));
return json_sig;
}