Update .gitignore with syncthing hiden file

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

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index 6167335..e9f9fc7 100644 (file)
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -83,7 +83,7 @@ void can_bus_t::process_can_signals(const can_message_t& can_message, std::map<i
        if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
        {
                bool send = true;
-               decoded_message = decoder_t::translateSignal(*sig->get_can_signal(), can_message, application_t::instance().get_all_can_signals(), &send);
+               decoded_message = decoder_t::translate_signal(*sig->get_can_signal(), can_message, &send);
                openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
                vehicle_message = build_VehicleMessage(s_message, can_message.get_timestamp());
 
@@ -91,7 +91,7 @@ void can_bus_t::process_can_signals(const can_message_t& can_message, std::map<i
                {
                        std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
                        push_new_vehicle_message(subscription_id, vehicle_message);
-                       DEBUG("%s CAN signals processed.",  sig->get_name().c_str());
+                       AFB_DEBUG("%s CAN signals processed.",  sig->get_name().c_str());
                }
        }
 }
@@ -116,7 +116,7 @@ void can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, const
                {
                        std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
                        push_new_vehicle_message(subscription_id, vehicle_message);
-                       DEBUG("%s CAN signals processed.",  s[subscription_id]->get_name().c_str());
+                       AFB_DEBUG("%s CAN signals processed.",  s[subscription_id]->get_name().c_str());
                }
        }
 }
@@ -128,7 +128,7 @@ void can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, const
 ///
 /// It will take from the can_message_q_ queue the next can message to process then it search
 ///  about signal subscribed if there is a valid afb_event for it. We only decode signal for which a
-///  subscription has been made. Can message will be decoded using translateSignal that will pass it to the
+///  subscription has been made. Can message will be decoded using translate_signal that will pass it to the
 ///  corresponding decoding function if there is one assigned for that signal. If not, it will be the default
 ///  noopDecoder function that will operate on it.
 ///
@@ -249,7 +249,7 @@ const can_message_t can_bus_t::next_can_message()
        {
                can_msg = can_message_q_.front();
                can_message_q_.pop();
-               DEBUG("Here is the next can message : id %X, length %X, data %02X%02X%02X%02X%02X%02X%02X%02X", can_msg.get_id(), can_msg.get_length(),
+               AFB_DEBUG("Here is the next can message : id %X, length %X, data %02X%02X%02X%02X%02X%02X%02X%02X", can_msg.get_id(), can_msg.get_length(),
                        can_msg.get_data()[0], can_msg.get_data()[1], can_msg.get_data()[2], can_msg.get_data()[3], can_msg.get_data()[4], can_msg.get_data()[5], can_msg.get_data()[6], can_msg.get_data()[7]);
                return can_msg;
        }
@@ -276,7 +276,7 @@ std::pair<int, openxc_VehicleMessage> can_bus_t::next_vehicle_message()
        {
                v_msg = vehicle_message_q_.front();
                vehicle_message_q_.pop();
-               DEBUG("next vehicle message poped");
+               AFB_DEBUG("next vehicle message poped");
                return v_msg;
        }
 
@@ -295,12 +295,15 @@ void can_bus_t::push_new_vehicle_message(int subscription_id, const openxc_Vehic
 /// mapping configuration file read at initialization.
 void can_bus_t::set_can_devices()
 {
-       can_devices_ = conf_file_.get_devices_name();
-
-       if(can_devices_.empty())
+       if(conf_file_.check_conf())
        {
-               ERROR("No mapping found in config file: '%s'. Check it that it have a CANbus-mapping section.",
-                       conf_file_.filepath().c_str());
+               can_devices_mapping_ = conf_file_.get_devices_name();
+
+               if(can_devices_mapping_.empty())
+               {
+                       AFB_ERROR("No mapping found in config file: '%s'. Check it that it have a CANbus-mapping section.",
+                               conf_file_.filepath().c_str());
+               }
        }
 }
 
@@ -310,7 +313,7 @@ void can_bus_t::set_can_devices()
 int can_bus_t::get_can_device_index(const std::string& bus_name) const
 {
        int i = 0;
-       for(const auto& d: can_devices_)
+       for(const auto& d: can_devices_mapping_)
        {
                if(d.first == bus_name)
                        break;
@@ -324,8 +327,8 @@ int can_bus_t::get_can_device_index(const std::string& bus_name) const
 /// general.
 const std::string can_bus_t::get_can_device_name(const std::string& id_name) const
 {
-       std::string ret;
-       for(const auto& d: can_devices_)
+       std::string ret = "";
+       for(const auto& d: can_devices_mapping_)
        {
                if(d.first == id_name)
                {