From 5119aba2b4ce9c3f5f7f68c35d0f1140d64f0931 Mon Sep 17 00:00:00 2001 From: Manuel Pitz Date: Mon, 4 Oct 2021 22:13:15 +0200 Subject: [PATCH] update to edgeflex format --- lib/formats/json_edgeflex.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/formats/json_edgeflex.cpp b/lib/formats/json_edgeflex.cpp index d0e7c3757..609fa7daf 100644 --- a/lib/formats/json_edgeflex.cpp +++ b/lib/formats/json_edgeflex.cpp @@ -53,14 +53,12 @@ int JsonEdgeflexFormat::packSample(json_t **json_smp, const struct sample *smp) json_array_append_new(json_data, json_value); } - if (smp->flags & (int) SampleFlags::HAS_TS_ORIGIN) { - json_created = json_integer(time_to_double(&smp->ts.origin) * 1e3); - json_object_set_new(json_value, "created", json_created); - } - - json_root = json_pack_ex(&err, 0, "{ s: o }", - "measurement", json_data + json_created = json_integer(time_to_double(&smp->ts.origin) * 1e3); + json_root = json_pack_ex(&err, 0, "{ s: o, s : o }", + "measurement", json_data, + "created", json_created ); + if (json_root == nullptr) return -1;