Fix: decoder_t class decodeSignal method signature

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

diff --git a/src/can_decode_message.cpp b/src/can_decode_message.cpp
index a28fa18..51993b8 100644 (file)
--- a/src/can_decode_message.cpp
+++ b/src/can_decode_message.cpp
@@ -16,53 +16,41 @@
  * limitations under the License.
  */
 
-#include <linux/can.h>
-#include <linux/can/raw.h>
-#include <queue>
-#include <sys/timeb.h>
-
-#include <afb/afb-binding.h>
-
-#include "can-utils.hpp"
-#include "can-decoder.hpp"
-#include "openxc.pb.h"
-#include "openxc-utils.hpp"
+#include "can_decode_message.hpp"
 
 void can_decode_message(can_bus_t &can_bus)
 {
-       can_message_t can_message;
-       std:vector <CanSignal> signals;
-       std:vector <CanSignal>::iterator signals_i;
+       can_message_t can_message(interface) ;
+       std::vector <CanSignal> signals;
+       std::vector <CanSignal>::iterator signals_i;
        openxc_VehicleMessage vehicle_message;
        openxc_DynamicField search_key, ret;
        bool send = true;
-       
-       decoder_t decoder();
 
-       while(true)
+       decoder_t decoder;
+
+       while(can_bus.has_can_message())
        {
-               if(can_message = can_bus.next_can_message())
-               {
-                       /* First we have to found which CanSignal is */
-                       search_key = build_DynamicField(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, (double)can_message.get_id())
+               can_message = can_bus.next_can_message();
 
-                       signals = find_can_signals(search_key);
+               /* First we have to found which CanSignal is */
+               search_key = build_DynamicField((double)can_message.get_id());
+               signals = find_can_signals(search_key);
+               
+               /* Decoding the message ! Don't kill the messenger ! */
+               for(const auto& sig : signals)
+               {       
+                       subscribed_signals_i = subscribed_signals.find(sig.genericName);
                        
-                       /* Decoding the message ! Don't kill the messenger ! */
-                       for(const auto& sig : signals)
-                       {       
-                               subscribed_signals_i = subscribed_signals.find(sig.genericName);
-                               
-                               if(subscribed_signals_i != subscribed_signals.end() &&
-                                       afb_event_is_valid(subscribed_signals_i->second))
-                               {
-                                       ret = decoder.decodeSignal(sig, can_message, getSignals(), &send);
+                       if(subscribed_signals_i != subscribed_signals.end() &&
+                               afb_event_is_valid(subscribed_signals_i->second))
+                       {
+                               ret = decoder.decodeSignal(sig, can_message, getSignals(), &send);
+
+                               openxc_SimpleMessage s_message = build_SimpleMessage(sig.genericName, ret);
 
-                                       s_message = build_SimpleMessage(sig.genericName, ret);
-                                               
-                                       vehicle_message = build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, s_message);
-                                       vehicle_message_q.push(vehicle_message);
-                               }
+                               vehicle_message = build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, s_message);
+                               can_bus.push_new_vehicle_message(vehicle_message);
                        }
                }
        }