X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-bus.cpp;h=e4f22e544ccddc884ac9cd6255bd5a6a66684014;hb=acb0ad5052b81c111333a75f99bdf4bafe299792;hp=6b3689d0e8900f30132efe7a484079d9c7d14e0f;hpb=f0973849c4df5740ffb241a21fc08398fa741a7e;p=apps%2Flow-level-can-service.git

diff --git a/CAN-binder/low-can-binding/can/can-bus.cpp b/CAN-binder/low-can-binding/can/can-bus.cpp
index 6b3689d..e4f22e5 100644
--- a/CAN-binder/low-can-binding/can/can-bus.cpp
+++ b/CAN-binder/low-can-binding/can/can-bus.cpp
@@ -15,20 +15,21 @@
  * limitations under the License.
  */
 
-#include <map>
-#include <cerrno>
-#include <vector>
-#include <string>
 #include <net/if.h>
 #include <sys/socket.h>
 #include <json-c/json.h>
 #include <linux/can/raw.h>
+#include <map>
+#include <cerrno>
+#include <vector>
+#include <string>
+#include <algorithm>
 
 #include "can-bus.hpp"
 
 #include "can-signals.hpp"
 #include "can-decoder.hpp"
-#include "../configuration.hpp"
+#include "../binding/configuration.hpp"
 #include "../utils/signals.hpp"
 #include "../utils/openxc-utils.hpp"
 
@@ -56,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;
@@ -70,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++;
 		}
 	}
@@ -242,12 +242,12 @@ int can_bus_t::init_can_dev()
 			for(const auto& device : devices_name)
 			{
 				can_bus_t::can_devices_[device] = std::make_shared<can_bus_dev_t>(device, i);
-				if (can_bus_t::can_devices_[device]->open(true) >= 0)
+				if (can_bus_t::can_devices_[device]->open() >= 0)
 				{
 					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