2 files changed, 11 insertions, 7 deletions
diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp
index 851f62a5..034e0ac9 100644
--- a/src/can/can-bus.cpp
+++ b/src/can/can-bus.cpp
@@ -31,6 +31,7 @@
 
 #include "can/can-decoder.hpp"
 #include "utils/openxc-utils.hpp"
+#include "obd2/diagnostic-manager.hpp"
 
 extern "C"
 {
@@ -363,10 +364,9 @@ 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}
-{
-}
+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)}
+{}
 
 /**
 * @brief Open the can socket and returning it 
diff --git a/src/can/can-bus.hpp b/src/can/can-bus.hpp
index 0fa13b22..3f85b4eb 100644
--- a/src/can/can-bus.hpp
+++ b/src/can/can-bus.hpp
@@ -27,6 +27,8 @@
 #include "utils/timer.hpp"
 #include "can/can-signals.hpp"
 #include "can/can-message.hpp"
+#include "obd2/diagnostic-manager.hpp"
+
 #include "low-can-binding.hpp"
 
 // TODO actual max is 32 but dropped to 24 for memory considerations
@@ -37,6 +39,7 @@
 #define CAN_ACTIVE_TIMEOUT_S 30
 
 class can_bus_dev_t;
+class diagnostic_manager_t;
 
 /** 
  * @class can_bus_t
@@ -105,10 +108,12 @@ class can_bus_dev_t {
 		int can_socket_; /*!< socket handler for the can device */
 		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);
 
 	public:
@@ -116,7 +121,6 @@ class can_bus_dev_t {
 
 		int open();
 		int close();
-		
 
 		void start_reading(can_bus_t& can_bus);