diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-04-24 19:16:16 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-04-24 19:16:16 +0200 |
| commit | 0b4dccf94a2a6b1ff4f5dc233b0ce0977927096d (patch) | |
| tree | f19cc359591be961e823d131997375e2a336da04 /CAN-binder/low-can-binding/can/can-bus.hpp | |
| parent | 84264431ca5a9958b3bb00b3de481336cf0cccb1 (diff) | |
Misc: Cleanup, typo, formating and comments update.
Change-Id: Icac565b9a3a80dc05a1a3470a35e223c8c564347
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/can/can-bus.hpp')
| -rw-r--r-- | CAN-binder/low-can-binding/can/can-bus.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp index 2194fa22..11b3b7af 100644 --- a/CAN-binder/low-can-binding/can/can-bus.hpp +++ b/CAN-binder/low-can-binding/can/can-bus.hpp @@ -29,8 +29,7 @@ #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 @@ -52,6 +51,9 @@ class can_bus_t private: 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); + 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 @@ -80,9 +82,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(); |