can_bus: Add unit in the json that low-can emits

This commit allow if the unit is defined to display it
in the json emmits by low-can.

Change-Id: Ia09d4d9614eba6de93292ffab351fa1f4e612b73
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index 0510998..f6b5add 100644 (file)
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -213,7 +213,7 @@ void can_bus_t::can_event_push()
                                if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event()))
                                {
                                        jo = json_object_new_object();
-                                       jsonify_vehicle(v_message.second, jo);
+                                       jsonify_vehicle(v_message.second, s[v_message.first]->get_signal(), jo);
                                        if(afb_event_push(s[v_message.first]->get_event(), jo) == 0)
                                        {
                                                if(v_message.second.has_diagnostic_response)

diff --git a/low-can-binding/utils/openxc-utils.cpp b/low-can-binding/utils/openxc-utils.cpp
index b88c45d..e2cf8d5 100644 (file)
--- a/low-can-binding/utils/openxc-utils.cpp
+++ b/low-can-binding/utils/openxc-utils.cpp
@@ -434,20 +434,23 @@ bool jsonify_simple(const openxc_SimpleMessage& s_msg, json_object* json)
 ///
 /// @param[in] v_msg - const reference to an openxc_VehicleMessage
 /// struct to convert into a json object.
+/// @param[in] sig - signal reference to the subscription of openxc_VehicleMessage,
+/// to get more informations about it
 /// @param[out] json - pointer with the DynamicField converted into json object
 ///
 /// @return True if VehicleMessage has been transformed into json object
 ///  and false if not. In such case, a json object is returned { "error": "error msg"}
 ///
-bool jsonify_vehicle(const openxc_VehicleMessage& v_msg, json_object* json)
+bool jsonify_vehicle(const openxc_VehicleMessage& v_msg, std::shared_ptr<signal_t> sig, json_object* json)
 {
        if(jsonify_simple(get_simple_message(v_msg), json))
        {
+               if(sig != nullptr && sig->get_unit() != "")
+                       json_object_object_add(json, "unit", json_object_new_string(sig->get_unit().c_str()));
+
                if(v_msg.has_timestamp)
-               {
                        json_object_object_add(json, "timestamp", json_object_new_int64(v_msg.timestamp));
-                       return true;
-               }
+
                return true;
        }
        json_object_object_add(json, "error", json_object_new_string("openxc_SimpleMessage doesn't have name'"));

diff --git a/low-can-binding/utils/openxc-utils.hpp b/low-can-binding/utils/openxc-utils.hpp
index 61f365b..675dc2f 100644 (file)
--- a/low-can-binding/utils/openxc-utils.hpp
+++ b/low-can-binding/utils/openxc-utils.hpp
@@ -23,6 +23,7 @@
 #include <sys/timeb.h>
 
 #include "openxc.pb.h"
+#include "../can/signals.hpp"
 #include "../diagnostic/active-diagnostic-request.hpp"
 
 const openxc_VehicleMessage build_VehicleMessage(active_diagnostic_request_t* request, const DiagnosticResponse& response, float parsed_value);
@@ -48,4 +49,4 @@ void jsonify_DynamicField(const openxc_DynamicField& field, json_object* value);
 
 bool jsonify_simple(const openxc_SimpleMessage& s_msg, json_object* json);
 
-bool jsonify_vehicle(const openxc_VehicleMessage& v_msg, json_object* json);
+bool jsonify_vehicle(const openxc_VehicleMessage& v_msg, std::shared_ptr<signal_t> sig, json_object* json);