aboutsummaryrefslogtreecommitdiffstats
path: root/low-can-binding/binding
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2019-11-09 13:21:43 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2019-11-09 13:21:43 +0100
commitfa37dc8ca800a76f9b77c2fdeebd7a9c9587a358 (patch)
tree65c64431d4ea7e39140233e14a808b10afe76ffa /low-can-binding/binding
parent2ae3f4a6d1e4f45ebf877227d22e73b9015ce395 (diff)
diag-mng: Change way to initialize the diag bus
This was kind of hardcoded and now, it is initialized by a configuration key of the controller configuration JSON file. Change-Id: I6e24c28781c08bd8e99de33f16b5ae10d1a6a9a1 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/binding')
-rw-r--r--low-can-binding/binding/application.hpp2
-rw-r--r--low-can-binding/binding/low-can-subscription.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/low-can-binding/binding/application.hpp b/low-can-binding/binding/application.hpp
index 30e21833..d6d0f67a 100644
--- a/low-can-binding/binding/application.hpp
+++ b/low-can-binding/binding/application.hpp
@@ -65,8 +65,6 @@ class application_t
std::map<std::string, std::shared_ptr<low_can_subscription_t> >& get_can_devices();
- const std::string get_diagnostic_bus() const;
-
diagnostic_manager_t& get_diagnostic_manager() ;
uint8_t get_active_message_set() const;
diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp
index 8c314af7..e75bddf5 100644
--- a/low-can-binding/binding/low-can-subscription.cpp
+++ b/low-can-binding/binding/low-can-subscription.cpp
@@ -370,7 +370,7 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co
if( subscription.signal_ )
ret = subscription.socket_->open(subscription.signal_->get_message()->get_bus_device_name());
else if(! subscription.diagnostic_message_.empty())
- ret = subscription.socket_->open(application_t::instance().get_diagnostic_bus());
+ ret = subscription.socket_->open(application_t::instance().get_diagnostic_manager().get_bus_name());
else if(! bus_name.empty())
ret = subscription.socket_->open(bus_name);