X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcan%2Fcan-bus.hpp;h=eb4747693549db66bf00dbe6bc27fa81ba0fe0ac;hb=7b336475a398d37c4d5c4a534c87919263ae4b01;hp=b4f1a3ee375065a835f4781d6ec59e48cd75e158;hpb=f0d7a6523955ee94a32ec4b62e2a207b23f62316;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/can/can-bus.hpp b/src/can/can-bus.hpp
index b4f1a3ee..eb474769 100644
--- a/src/can/can-bus.hpp
+++ b/src/can/can-bus.hpp
@@ -25,11 +25,9 @@
 #include <condition_variable>
 
 #include "openxc.pb.h"
-#include "../utils/timer.hpp"
-#include "can-signals.hpp"
 #include "can-message.hpp"
 #include "can-bus-dev.hpp"
-#include "../obd2/active-diagnostic-request.hpp"
+#include "../diagnostic/active-diagnostic-request.hpp"
 
 #include "../low-can-binding.hpp"
 
@@ -50,25 +48,25 @@
 class can_bus_t
 {
 private:
-	int conf_file_; /// < configuration file handle used to initialize can_bus_dev_t objects.
+	int conf_file_; ///< configuration file handle used to initialize can_bus_dev_t objects.
 
 	void can_decode_message();
-	std::thread th_decoding_; /// < thread that'll handle decoding a can frame
-	bool is_decoding_ = false; /// < boolean member controling thread while loop
+	std::thread th_decoding_; ///< thread that'll handle decoding a can frame
+	bool is_decoding_ = false; ///< boolean member controling thread while loop
 
 	void can_event_push();
-	std::thread th_pushing_; /// < thread that'll handle pushing decoded can frame to subscribers
-	bool is_pushing_ = false; /// < boolean member controling thread while loop
+	std::thread th_pushing_; ///< thread that'll handle pushing decoded can frame to subscribers
+	bool is_pushing_ = false; ///< boolean member controling thread while loop
 
-	std::condition_variable new_can_message_cv_; /// < condition_variable use to wait until there is a new CAN message to read
-	std::mutex can_message_mutex_; /// < mutex protecting the can_message_q_ queue.
-	std::queue <can_message_t> can_message_q_; /// < queue that'll store can_message_t to decoded
+	std::condition_variable new_can_message_cv_; ///< condition_variable use to wait until there is a new CAN message to read
+	std::mutex can_message_mutex_; ///< mutex protecting the can_message_q_ queue.
+	std::queue <can_message_t> can_message_q_; ///< queue that'll store can_message_t to decoded
 
-	std::condition_variable new_decoded_can_message_; /// < condition_variable use to wait until there is a new vehicle message to read from the queue vehicle_message_q_
-	std::mutex decoded_can_message_mutex_;  /// < mutex protecting the vehicle_message_q_ queue.
-	std::queue <openxc_VehicleMessage> vehicle_message_q_; /// < queue that'll store openxc_VehicleMessage to pushed 
+	std::condition_variable new_decoded_can_message_; ///< condition_variable use to wait until there is a new vehicle message to read from the queue vehicle_message_q_
+	std::mutex decoded_can_message_mutex_;  ///< mutex protecting the vehicle_message_q_ queue.
+	std::queue <openxc_VehicleMessage> vehicle_message_q_; ///< queue that'll store openxc_VehicleMessage to pushed
 
-	std::vector<std::shared_ptr<can_bus_dev_t>> can_devices_; /// < Can device map containing all can_bus_dev_t objects initialized during init_can_dev function
+	static std::map<std::string, std::shared_ptr<can_bus_dev_t>> can_devices_; ///< Can device map containing all can_bus_dev_t objects initialized during init_can_dev function
 
 public:
 	can_bus_t(int conf_file);
@@ -81,7 +79,7 @@ public:
 	void stop_threads();
 
 	int process_can_signals(can_message_t& can_message);
-	int process_diagnostic_signals(active_diagnostic_request_t* adr, const can_message_t& can_message);
+	int process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message);
 
 	can_message_t next_can_message();
 	void push_new_can_message(const can_message_t& can_msg);
@@ -91,6 +89,6 @@ public:
 	openxc_VehicleMessage next_vehicle_message();
 	void push_new_vehicle_message(const openxc_VehicleMessage& v_msg);
 
-	const std::vector<std::shared_ptr<can_bus_dev_t>>& get_can_devices() const;
+	const std::map<std::string, std::shared_ptr<can_bus_dev_t>>& get_can_devices() const;
+	static std::shared_ptr<can_bus_dev_t> get_can_device(std::string bus);
 };
-