Reworked reading CAN devices from BCM socket.

[apps/agl-service-can-low-level.git] / CAN-binder / low-can-binding / can / can-bus.hpp

diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp
index 5715c74..94aa042 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-bus.hpp
+++ b/CAN-binder/low-can-binding/can/can-bus.hpp
@@ -27,9 +27,9 @@
 #include "openxc.pb.h"
 #include "can-message.hpp"
 #include "can-bus-dev.hpp"
+#include "can-signals.hpp"
 #include "../utils/config-parser.hpp"
-#include "../diagnostic/active-diagnostic-request.hpp"
-
+#include "../diagnostic/diagnostic-manager.hpp"
 #include "../low-can-binding.hpp"
 
 // TODO actual max is 32 but dropped to 24 for memory considerations
@@ -49,7 +49,14 @@
 class can_bus_t
 {
 private:
-       utils::config_parser_t& conf_file_; ///< configuration file handle used to initialize can_bus_dev_t objects.
+       utils::config_parser_t conf_file_; ///< configuration file handle used to initialize can_bus_dev_t objects.
+
+       int process_can_signals(can_message_t& can_message);
+       int process_diagnostic_signals(diagnostic_manager_t& manager, const can_message_t& can_message);
+
+       int can_reader();
+       std::thread th_reading_; ///< Thread handling read the socket can device filling can_message_q_ queue of can_bus_t
+       bool is_reading_ = false; ///< boolean telling whether or not reading is running or not
 
        void can_decode_message();
        std::thread th_decoding_; ///< thread that'll handle decoding a can frame
@@ -79,9 +86,6 @@ 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();
@@ -90,6 +94,8 @@ public:
        openxc_VehicleMessage next_vehicle_message();
        void push_new_vehicle_message(const openxc_VehicleMessage& v_msg);
 
+       int create_rx_filter(const can_signal_t& signal);
+
        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);
 };