Message definition can return ref instead of value.

[apps/low-level-can-service.git] / CAN-binder / low-can-binding / can / can-bus.cpp

diff --git a/CAN-binder/low-can-binding/can/can-bus.cpp b/CAN-binder/low-can-binding/can/can-bus.cpp
index 6e74b86..e4f22e5 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-bus.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus.cpp
@@ -29,7 +29,7 @@
 
 #include "can-signals.hpp"
 #include "can-decoder.hpp"
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 #include "../utils/signals.hpp"
 #include "../utils/openxc-utils.hpp"
 
@@ -57,7 +57,7 @@ std::map<std::string, std::shared_ptr<can_bus_dev_t>> can_bus_t::can_devices_;
 /// @param[in] can_message - a single CAN message from the CAN socket read, to be decode.
 ///
 /// @return How many signals has been decoded.
-int can_bus_t::process_can_signals(can_message_t& can_message)
+int can_bus_t::process_can_signals(const can_message_t& can_message)
 {
        int processed_signals = 0;
        struct utils::signals_found signals;
@@ -71,25 +71,24 @@ int can_bus_t::process_can_signals(can_message_t& can_message)
        signals = sm.find_signals(search_key);
 
        // Decoding the message ! Don't kill the messenger !
-       for(auto& sig : signals.can_signals)
+       for(const auto& sig : signals.can_signals)
        {
                std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
                std::map<std::string, struct afb_event>& s = sm.get_subscribed_signals();
 
-               // DEBUG message to make easier debugger STL containers...
-               //DEBUG(binder_interface, "Operator[] key char: %s, event valid? %d", sig.generic_name, afb_event_is_valid(s[sig.generic_name]));
-               //DEBUG(binder_interface, "Operator[] key string: %s, event valid? %d", sig.generic_name, afb_event_is_valid(s[std::string(sig.generic_name)]));
-               //DEBUG(binder_interface, "Nb elt matched char: %d", (int)s.count(sig.generic_name));
-               //DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.generic_name));
                if( s.find(sig->get_name()) != s.end() && afb_event_is_valid(s[sig->get_name()]))
                {
-                       decoded_message = decoder_t::translateSignal(*sig, can_message, conf.get_can_signals());
+                       bool send = true;
+                       decoded_message = decoder_t::translateSignal(*sig, can_message, conf.get_can_signals(), &send);
 
-                       openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
-                       vehicle_message = build_VehicleMessage(s_message);
+                       if(send)
+                       {
+                               openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
+                               vehicle_message = build_VehicleMessage(s_message);
 
-                       std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
-                       push_new_vehicle_message(vehicle_message);
+                               std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
+                               push_new_vehicle_message(vehicle_message);
+                       }
                        processed_signals++;
                }
        }
@@ -248,7 +247,7 @@ int can_bus_t::init_can_dev()
                                        can_bus_t::can_devices_[device]->configure();
                                        DEBUG(binder_interface, "%s: Start reading thread", __FUNCTION__);
                                        NOTICE(binder_interface, "%s: %s device opened and reading", __FUNCTION__, device.c_str());
-                                       can_bus_t::can_devices_[device]->start_reading(*this);
+                                       //can_bus_t::can_devices_[device]->start_reading(*this);
                                        i++;
                                }
                                else
@@ -336,15 +335,6 @@ void can_bus_t::push_new_vehicle_message(const openxc_VehicleMessage& v_msg)
        vehicle_message_q_.push(v_msg);
 }
 
-/// @brief Create a RX_SETUP receive job for the BCM socket of a CAN signal.
-///
-/// @return 0 if ok -1 if not.
-       int can_bus_t::create_rx_filter(const can_signal_t& s)
-       {
-               const std::string& bus  = s.get_message().get_bus_name();
-               return can_bus_t::can_devices_[bus]->create_rx_filter(s);
-       }
-
 /// @brief Return a map with the can_bus_dev_t initialized
 ///
 /// @return map can_bus_dev_m_ map