diff options
| -rw-r--r-- | low-can-binding/can/can-bus.cpp | 4 | ||||
| -rw-r--r-- | low-can-binding/utils/openxc-utils.cpp | 25 | ||||
| -rw-r--r-- | low-can-binding/utils/openxc-utils.hpp | 4 |
3 files changed, 29 insertions, 4 deletions
diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp index e9f9fc7e..be40aab5 100644 --- a/low-can-binding/can/can-bus.cpp +++ b/low-can-binding/can/can-bus.cpp @@ -165,7 +165,6 @@ void can_bus_t::can_decode_message() /// which are events that has to be pushed. void can_bus_t::can_event_push() { - openxc_SimpleMessage s_message; json_object* jo; utils::signals_manager_t& sm = utils::signals_manager_t::instance(); @@ -180,11 +179,10 @@ void can_bus_t::can_event_push() { std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex()); std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals(); - s_message = get_simple_message(v_message.second); if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event())) { jo = json_object_new_object(); - jsonify_simple(s_message, jo); + jsonify_vehicle(v_message.second, 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 3b404f09..35b7d9c9 100644 --- a/low-can-binding/utils/openxc-utils.cpp +++ b/low-can-binding/utils/openxc-utils.cpp @@ -349,3 +349,28 @@ bool jsonify_simple(const openxc_SimpleMessage& s_msg, json_object* json) json_object_object_add(json, "error", json_object_new_string("openxc_SimpleMessage doesn't have name'")); return false; } + +/// +/// @brief Make a JSON object from a VehicleMessage +/// +/// @param[in] v_msg - const reference to an openxc_VehicleMessage +/// struct to convert into a json object. +/// @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) +{ + if(jsonify_simple(get_simple_message(v_msg), json)) + { + if(v_msg.has_timestamp) + { + json_object_object_add(json, "timestamp", json_object_new_double(v_msg.timestamp)); + return true; + } + return true; + } + json_object_object_add(json, "error", json_object_new_string("openxc_SimpleMessage doesn't have name'")); + return false; +} diff --git a/low-can-binding/utils/openxc-utils.hpp b/low-can-binding/utils/openxc-utils.hpp index 83d63797..57663045 100644 --- a/low-can-binding/utils/openxc-utils.hpp +++ b/low-can-binding/utils/openxc-utils.hpp @@ -44,4 +44,6 @@ const openxc_SimpleMessage get_simple_message(const openxc_VehicleMessage& v_msg void jsonify_DynamicField(const openxc_DynamicField& field, json_object* value); -bool jsonify_simple(const openxc_SimpleMessage& s_msg, json_object* json);
\ No newline at end of file +bool jsonify_simple(const openxc_SimpleMessage& s_msg, json_object* json); + +bool jsonify_vehicle(const openxc_VehicleMessage& v_msg, json_object* json); |