diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-06-25 16:23:02 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-27 09:33:12 +0200 |
| commit | f9b67aecdc07d31def64175e0f58e9c0a113f94c (patch) | |
| tree | 74a0baa6ca5d12a60f2c87893ccc086fe44fa0ce /low-can-binding/binding | |
| parent | b8261a3b218de8c07173e3a0eaeb09cad10445b3 (diff) | |
Minor improvements
- Remove now unused forward declaration of active_diagnostic_request_t
- Factorize calling the signals_manager at binding initialization.
- retab...
Bug-AGL: SPEC-2386
Change-Id: I418fddd80ef8b856c198dc697760a6edf0918012
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/binding')
| -rw-r--r-- | low-can-binding/binding/low-can-cb.cpp | 4 | ||||
| -rw-r--r-- | low-can-binding/binding/low-can-subscription.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp index b6a18ebb..dbeaa555 100644 --- a/low-can-binding/binding/low-can-cb.cpp +++ b/low-can-binding/binding/low-can-cb.cpp @@ -700,6 +700,7 @@ int init_binding(afb_api_t api) can_bus_manager.set_can_devices(); can_bus_manager.start_threads(); + utils::signals_manager_t& sm = utils::signals_manager_t::instance(); /// Initialize Diagnostic manager that will handle obd2 requests. /// We pass by default the first CAN bus device to its Initialization. @@ -709,7 +710,7 @@ int init_binding(afb_api_t api) // Add a recurring dignostic message request to get engine speed at all times. openxc_DynamicField search_key = build_DynamicField("diagnostic_messages.engine.speed"); - struct utils::signals_found sf = utils::signals_manager_t::instance().find_signals(search_key); + struct utils::signals_found sf = sm.find_signals(search_key); if(sf.signals.empty() && sf.diagnostic_messages.size() == 1) { @@ -718,7 +719,6 @@ int init_binding(afb_api_t api) struct event_filter_t event_filter; event_filter.frequency = sf.diagnostic_messages.front()->get_frequency(); - utils::signals_manager_t& sm = utils::signals_manager_t::instance(); std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals(); subscribe_unsubscribe_diagnostic_messages(request, true, sf.diagnostic_messages, event_filter, s, true); diff --git a/low-can-binding/binding/low-can-subscription.cpp b/low-can-binding/binding/low-can-subscription.cpp index 54cd314c..c2f31a03 100644 --- a/low-can-binding/binding/low-can-subscription.cpp +++ b/low-can-binding/binding/low-can-subscription.cpp @@ -248,14 +248,14 @@ int low_can_subscription_t::open_socket(low_can_subscription_t &subscription, co std::shared_ptr<utils::socketcan_j1939_t> socket = std::make_shared<utils::socketcan_j1939_t>(); ret = socket->open(subscription.signal_->get_message()->get_bus_device_name(), name, pgn, addr); subscription.socket_ = socket; - } - else if ( !bus_name.empty()) - { + } + else if ( !bus_name.empty()) + { std::shared_ptr<utils::socketcan_j1939_t> socket = std::make_shared<utils::socketcan_j1939_t>(); ret = socket->open(bus_name, name, pgn, addr); subscription.socket_ = socket; - } - subscription.index_ = (int)subscription.socket_->socket(); + } + subscription.index_ = (int)subscription.socket_->socket(); } else { |