From 1d464d2a7380248b04c3e734ed5c6e84bbf53ddf Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 15 Mar 2017 13:04:42 +0100 Subject: Revert accessing CAN device with a map indexing on dev name Main reason for that behavior revert is because of generator that rely on CAN device name and so we have point on these object by specify the device name. Instead of shared pointer between objects, instead binding is based on device name. With a device name you can get the shared pointer on it using new static method from can_bus_t object. Change-Id: I331e0ad8d03c88a15c697d12a9fce3699b0cd962 Signed-off-by: Romain Forlot --- src/can/can-message-definition.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/can/can-message-definition.hpp') diff --git a/src/can/can-message-definition.hpp b/src/can/can-message-definition.hpp index 1c7199e6..921b58ad 100644 --- a/src/can/can-message-definition.hpp +++ b/src/can/can-message-definition.hpp @@ -35,7 +35,7 @@ class can_message_definition_t { private: - uint8_t bus_; /*!< bus_ - Address of CAN bus device. */ + std::string bus_; /*!< bus_ - Address of CAN bus device. */ uint32_t id_; /*!< id_ - The ID of the message.*/ can_message_format_t format_; /*!< format_ - the format of the message's ID.*/ frequency_clock_t frequency_clock_; /*!< clock_ - an optional frequency clock to control the output of this @@ -48,8 +48,9 @@ private: * needs to compare an incoming CAN message with the previous frame.*/ public: - can_message_definition_t(uint8_t bus); - can_message_definition_t(uint8_t bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed); + can_message_definition_t(const std::string bus); + can_message_definition_t(const std::string bus, uint32_t id, frequency_clock_t frequency_clock, bool force_send_changed); + 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); uint32_t get_id() const; }; -- cgit 1.2.3-korg