Change way to convert simplemessage into a json

[apps/agl-service-can-low-level.git] / src / can_event_push.cpp

diff --git a/src/can_event_push.cpp b/src/can_event_push.cpp
index 9251da6..2842c63 100644 (file)
--- a/src/can_event_push.cpp
+++ b/src/can_event_push.cpp
@@ -22,16 +22,19 @@ void can_event_push(can_bus_t& can_bus)
 {
        openxc_VehicleMessage v_message;
        openxc_SimpleMessage s_message;
-       iterator it_event;
-
-       while(true)
+       json_object* jo;
+       
+       while(can_bus.has_vehicle_message())
        {
-               if(v_message = can_bus->next_vehicle_message())
+               v_message = can_bus.next_vehicle_message();
+               s_message = get_simple_message(v_message);
+               std::map<std::string, struct afb_event> subscribed_signals = get_subscribed_signals();
+               const auto& it_event = subscribed_signals.find(s_message.name);
+               if(it_event != subscribed_signals.end() && afb_event_is_valid(it_event->second))
                {
-                       s_message = get_simple_message(v_msg);
-                       const auto& it_event = subscribed_signals.find(s_message.name);
-                       if(! it_event->end() && afb_event_is_valid(it_event->second))
-                               afb_event_push(it_event->second, jsonify_simple(s_message));
+                       jo = json_object_new_object();
+                       jsonify_simple(s_message, jo);
+                       afb_event_push(it_event->second, jo);
                }
        }
-}
+}
\ No newline at end of file