summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-08 00:21:21 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:09:03 +0100
commit64d3ead0ce87091a3489dd9796a9f77f241c468b (patch)
tree96c562c7f75dda78dcd627f4ad8115adc7eeaead
parentfdfd5bc284ffdd32f6b43b20d3297c6d8af3a714 (diff)
It isn't needed to initialize diag manager
for each can_bus_dev_t instance Indeed, generator will write the diag manager objects statically with the correct can_bus_dev_t instance to use. Change-Id: Ib52d93bff576ef962dc141f5936133e878977017
-rw-r--r--src/can/can-bus.cpp5
-rw-r--r--src/can/can-bus.hpp5
2 files changed, 2 insertions, 8 deletions
diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp
index 034e0ac..699cb8c 100644
--- a/src/can/can-bus.cpp
+++ b/src/can/can-bus.cpp
@@ -31,7 +31,6 @@
#include "can/can-decoder.hpp"
#include "utils/openxc-utils.hpp"
-#include "obd2/diagnostic-manager.hpp"
extern "C"
{
@@ -93,7 +92,7 @@ void can_bus_t::can_decode_message()
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))); */
+ DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.generic_name)));*/
if( s.find(sig->generic_name) != s.end() && afb_event_is_valid(s[sig->generic_name]))
{
decoded_message = decoder.translateSignal(*sig, can_message, get_can_signals());
@@ -365,7 +364,7 @@ std::map<std::string, std::shared_ptr<can_bus_dev_t>> can_bus_t::get_can_devices
* @param const string representing the device name into the linux /dev tree
*/
can_bus_dev_t::can_bus_dev_t(const std::string& dev_name)
- : device_name_{dev_name}, can_socket_{-1}, diagnostic_manager_{diagnostic_manager_t(*this)}
+ : device_name_{dev_name}, can_socket_{-1}
{}
/**
diff --git a/src/can/can-bus.hpp b/src/can/can-bus.hpp
index 3f85b4e..3ae41c9 100644
--- a/src/can/can-bus.hpp
+++ b/src/can/can-bus.hpp
@@ -27,7 +27,6 @@
#include "utils/timer.hpp"
#include "can/can-signals.hpp"
#include "can/can-message.hpp"
-#include "obd2/diagnostic-manager.hpp"
#include "low-can-binding.hpp"
@@ -39,7 +38,6 @@
#define CAN_ACTIVE_TIMEOUT_S 30
class can_bus_dev_t;
-class diagnostic_manager_t;
/**
* @class can_bus_t
@@ -109,9 +107,6 @@ class can_bus_dev_t {
bool is_fdmode_on_; /*!< boolean telling if whether or not the can socket use fdmode. */
struct sockaddr_can txAddress_; /*!< internal member using to bind to the socket */
- diagnostic_manager_t diagnostic_manager_; /*!< diagnostic_manager_t diagnostic_manager_ - A diagnostic_manager_t object instance
- * that will handle diagnostic obd2 protocol requests and responses.*/
-
std::thread th_reading_; /*!< Thread handling read the socket can device filling can_message_q_ queue of can_bus_t */
bool is_running_; /*!< boolean telling whether or not reading is running or not */
void can_reader(can_bus_t& can_bus);