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 e8eec0b..51993b8 100644 (file)
--- a/src/can_decode_message.cpp
+++ b/src/can_decode_message.cpp
@@ -16,62 +16,42 @@
  * limitations under the License.
  */
 
-#include <linux/can.h>
-#include <linux/can/raw.h>
-#include <queue>
+#include "can_decode_message.hpp"
 
-#include <afb/afb-binding.h>
-
-#include "can-utils.h"
-#include "can-decoder.h"
-#include "openxc.pb.h"
-
-void can_decode_message(CanBus_c *can_bus)
+void can_decode_message(can_bus_t &can_bus)
 {
-       CanMessage_c *can_message;
-       int i;
-       std:vector <CanSignal> *signals;
-       CanSignal sig;
+       can_message_t can_message(interface) ;
+       std::vector <CanSignal> signals;
+       std::vector <CanSignal>::iterator signals_i;
        openxc_VehicleMessage vehicle_message;
-       openxc_SimpleMessage s_message;
-       openxc_DynamicField key, ret;
-       Decoder_c decoder();
+       openxc_DynamicField search_key, ret;
+       bool send = true;
 
-       vehicle_message = {.has_type = true,
-                                         .type = openxc_VehicleMessage_Type::openxc_VehicleMessage_Type_SIMPLE,
-                                         .has_simple_message = true };
+       decoder_t decoder;
 
-       while(true)
+       while(can_bus.has_can_message())
        {
-               if(can_message = can_bus->next_can_message())
-               {
-                       /* First we have to found which CanSignal is */
-                       key = { .has_type = true,
-                                       .type = openxc_DynamicField_Type::openxc_DynamicField_Type_NUM,
-                                       .has_numeric_value = true,
-                                       .numeric_value = (double)can_message.get_id() };
-
-                       signals = GetSignals(key);
-
-                       /* Decoding the message ! Don't kill the messenger ! */
-                       for(i=0; i< signals.size(); i++)
+               can_message = can_bus.next_can_message();
+
+               /* 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);
+                       
+                       if(subscribed_signals_i != subscribed_signals.end() &&
+                               afb_event_is_valid(subscribed_signals_i->second))
                        {
-                               sig = signals.back();
-                               if(afb_event_is_valid(sig->event))
-                               {
-                                       ret = decoder.decodeSignal(&sig, can_message, SIGNALS, SIGNALS.size(), true);
+                               ret = decoder.decodeSignal(sig, can_message, getSignals(), &send);
+
+                               openxc_SimpleMessage s_message = build_SimpleMessage(sig.genericName, ret);
 
-                                       s_message = {.has_name = true,
-                                                                       .name = sig->genericName,
-                                                                       .has_value = true,
-                                                                       .value = ret
-                                                               };
-                                               
-                                       vehicle_message.simple_message = s_message;
-                                       vehicle_message_q.push(vehicle_message);
-                               }
-                                       signals.pop_back();
+                               vehicle_message = build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, s_message);
+                               can_bus.push_new_vehicle_message(vehicle_message);
                        }
                }
        }
-}
\ No newline at end of file
+}