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

json.edgeflex: add sample unpacking support

Browse source
This commit is contained in:
Steffen Vogel 2021-07-20 12:23:31 +02:00
parent 30441a96ad
commit fd7fddcf15
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/villas/formats/json_edgeflex.hpp
View file

@ -31,7 +31,8 @@ class JsonEdgeflexFormat : public JsonFormat {
protected:
int packSample(json_t **j, const struct sample *smp);
int unpackSample(json_t *json_smp, struct sample *smp);
public:
using JsonFormat::JsonFormat;
};

26
lib/formats/json_edgeflex.cpp
View file

@ -49,10 +49,32 @@ int JsonEdgeflexFormat::packSample(json_t **json_smp, const struct sample *smp)
if (json_created)
json_object_set_new(json_value, "created", json_created);
if (json_value == nullptr)
int JsonEdgeflexFormat::unpackSample(json_t *json_smp, struct sample *smp)
{
int ret;
json_int_t created = -1;
if (smp->capacity < 1)
return -1;
*json_smp = json_value;
struct signal *sig = (struct signal *) vlist_at_safe(signals, 0);
if (!sig)
return -1;
if (sig->type != SignalType::FLOAT)
return -1;
ret = json_unpack(json_smp, "{ s: f, s?: I }",
"value", &smp->data[0].f,
"created", &created
);
if (ret)
return ret;
if (created >= 0) {
smp->ts.origin = time_from_double(created / 1e3);
smp->flags |= (int) SampleFlags::HAS_TS_ORIGIN;
}
return 0;
}