diff options
Diffstat (limited to 'CAN-binder/low-can-binding/utils')
| -rw-r--r-- | CAN-binder/low-can-binding/utils/signals.cpp | 2 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/utils/signals.hpp | 5 | ||||
| -rw-r--r-- | CAN-binder/low-can-binding/utils/socketcan-bcm.cpp | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CAN-binder/low-can-binding/utils/signals.cpp b/CAN-binder/low-can-binding/utils/signals.cpp index 9dd3bfd..02b8405 100644 --- a/CAN-binder/low-can-binding/utils/signals.cpp +++ b/CAN-binder/low-can-binding/utils/signals.cpp @@ -39,7 +39,7 @@ namespace utils /// @brief return the subscribed_signals map. /// /// @return Map of subscribed signals. - std::map<std::string, struct afb_event>& signals_manager_t::get_subscribed_signals() + std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> >& signals_manager_t::get_subscribed_signals() { return subscribed_signals_; } diff --git a/CAN-binder/low-can-binding/utils/signals.hpp b/CAN-binder/low-can-binding/utils/signals.hpp index a0fa99d..54d8893 100644 --- a/CAN-binder/low-can-binding/utils/signals.hpp +++ b/CAN-binder/low-can-binding/utils/signals.hpp @@ -27,6 +27,7 @@ #include "../diagnostic/diagnostic-message.hpp" #include "../binding/low-can-hat.hpp" +#include "../binding/low-can-cb.hpp" namespace utils { @@ -40,7 +41,7 @@ namespace utils { private: std::mutex subscribed_signals_mutex_; - std::map<std::string, struct afb_event> subscribed_signals_; + std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> > subscribed_signals_; signals_manager_t(); ///< Private constructor to make singleton class. @@ -48,7 +49,7 @@ namespace utils static signals_manager_t& instance(); std::mutex& get_subscribed_signals_mutex(); - std::map<std::string, struct afb_event>& get_subscribed_signals(); + std::map<int, std::pair<std::shared_ptr<low_can_subscription_t>, struct afb_event> >& get_subscribed_signals(); struct signals_found find_signals(const openxc_DynamicField &key); void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<std::shared_ptr<diagnostic_message_t> >& found_signals); diff --git a/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp b/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp index 38f4852..1009a42 100644 --- a/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp +++ b/CAN-binder/low-can-binding/utils/socketcan-bcm.cpp @@ -90,6 +90,7 @@ namespace utils cm = ::can_message_t::convert_from_frame(msg.frames , nbytes-sizeof(struct bcm_msg_head), timestamp); + cm.set_sub_id((int)s.socket()); return s; } |