diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-05-16 17:37:07 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-19 11:36:43 +0200 |
| commit | d91f5f743bc6f6ec9aadfe96187b45dc93043f61 (patch) | |
| tree | e79bb26cb4ad4c97c07941ab6f31bb6b7c3fde22 /CAN-binder/low-can-binding/can/can-bus.hpp | |
| parent | fd3978709abbb3ed46caaf48c1d2f45b2c74fa89 (diff) | |
Include diagnostic_message_t into can_message_set.
Change-Id: I7372e469752dd8e90dc9431b9e5c67df12f56c29
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp index 7fe6ebf3..c300c7f4 100644 --- a/CAN-binder/low-can-binding/can/can-bus.hpp +++ b/CAN-binder/low-can-binding/can/can-bus.hpp @@ -26,9 +26,7 @@ #include "openxc.pb.h" #include "can-message.hpp" -#include "can-signals.hpp" #include "../utils/config-parser.hpp" -#include "../diagnostic/diagnostic-manager.hpp" #include "../binding/low-can-hat.hpp" // TODO actual max is 32 but dropped to 24 for memory considerations @@ -38,6 +36,8 @@ #define CAN_ACTIVE_TIMEOUT_S 30 +class diagnostic_manager_t; + /// @brief Object used to handle decoding and manage event queue to be pushed. /// /// This object is also used to initialize can_bus_dev_t object after reading @@ -76,7 +76,7 @@ public: void set_can_devices(); int get_can_device_index(std::string bus_name) const; - const std::string get_can_device_name(std::string id_name) const; + std::string get_can_device_name(std::string id_name) const; void start_threads(); void stop_threads(); |