Implement check of supported diagnostic PID.

[apps/agl-service-can-low-level.git] / src / can / can-bus.hpp

diff --git a/src/can/can-bus.hpp b/src/can/can-bus.hpp
index a001d1e..13a7830 100644 (file)
--- a/src/can/can-bus.hpp
+++ b/src/can/can-bus.hpp
@@ -29,6 +29,7 @@
 #include "can-signals.hpp"
 #include "can-message.hpp"
 #include "can-bus-dev.hpp"
+#include "../diagnostic/active-diagnostic-request.hpp"
 
 #include "../low-can-binding.hpp"
 
@@ -65,9 +66,9 @@ private:
 
        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::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);
@@ -79,6 +80,9 @@ public:
        void start_threads();
        void stop_threads();
 
+       int process_can_signals(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);
        std::mutex& get_can_message_mutex();
@@ -87,6 +91,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);
 };
-