diff options
Diffstat (limited to 'CAN-binder/low-can-binding/can')
| -rw-r--r-- | CAN-binder/low-can-binding/can/can-message-definition.cpp | 8 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/can/can-message-definition.hpp | 1 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/can/can-signals.cpp | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/CAN-binder/low-can-binding/can/can-message-definition.cpp b/CAN-binder/low-can-binding/can/can-message-definition.cpp index ec6292af..e0f55a6d 100644 --- a/CAN-binder/low-can-binding/can/can-message-definition.cpp +++ b/CAN-binder/low-can-binding/can/can-message-definition.cpp @@ -17,6 +17,8 @@ #include "can-message-definition.hpp" +#include "../binding/configuration.hpp" + can_message_definition_t::can_message_definition_t(const std::string bus) : parent_{nullptr}, bus_{bus}, last_value_{CAN_MESSAGE_SIZE} {} @@ -71,6 +73,12 @@ const std::string can_message_definition_t::get_bus_name() const return bus_; } +const std::string can_message_definition_t::get_bus_device_name() const +{ + return configuration_t::instance().get_can_bus_manager() + .get_can_device_name(bus_); +} + uint32_t can_message_definition_t::get_id() const { return id_; diff --git a/CAN-binder/low-can-binding/can/can-message-definition.hpp b/CAN-binder/low-can-binding/can/can-message-definition.hpp index 233d8ce8..3e150369 100644 --- a/CAN-binder/low-can-binding/can/can-message-definition.hpp +++ b/CAN-binder/low-can-binding/can/can-message-definition.hpp @@ -60,6 +60,7 @@ public: can_message_definition_t(const std::string bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed, const std::vector<std::shared_ptr<can_signal_t> >& can_signals); const std::string get_bus_name() const; + const std::string get_bus_device_name() const; uint32_t get_id() const; std::vector<std::shared_ptr<can_signal_t> >& get_can_signals(); diff --git a/CAN-binder/low-can-binding/can/can-signals.cpp b/CAN-binder/low-can-binding/can/can-signals.cpp index 9a876136..e49c7274 100644 --- a/CAN-binder/low-can-binding/can/can-signals.cpp +++ b/CAN-binder/low-can-binding/can/can-signals.cpp @@ -228,7 +228,7 @@ int can_signal_t::create_rx_filter() // Make sure that socket has been opened. if(! socket_) socket_.open( - get_message()->get_bus_name()); + get_message()->get_bus_device_name()); uint32_t can_id = get_message()->get_id(); |