Search into generic_name as well as name + prefix, but

[apps/agl-service-can-low-level.git] / src / low-can-binding.cpp

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index e7d8530..8ecf742 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -128,13 +128,11 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe,
 
        //TODO: Implement way to dynamically call the right function no matter 
        // how much signals types we have.
-       /// const std::string& can_prefix = configuration_t::instance().get_can_signals().front().get_prefix();
-       const std::string& obd2_prefix = configuration_t::instance().get_obd2_signals().front().get_prefix();
 
        for(const std::string& sig : signals)
        {
                int ret;
-               if (sig.find_first_of(obd2_prefix.c_str(), 0, obd2_prefix.size()))
+               if (active_diagnostic_request_t::is_diagnostic_signal(sig))
                {
                        std::vector<obd2_signal_t*> found;
                        configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found);
@@ -254,9 +252,10 @@ extern "C"
                        return 0;
                }
 
-               /// Initialize Diagnostic manager that will handle obd2 requests
-               diagnostic_manager_t& diag_manager = configuration_t::instance().get_diagnostic_manager();
-               diag_manager.initialize(can_bus_manager.get_can_devices().front());
+               /// Initialize Diagnostic manager that will handle obd2 requests.
+               /// We pass by default the first CAN bus device to its Initialization.
+               /// TODO: be able to choose the CAN bus device that will be use as Diagnostic bus.
+               configuration_t::instance().get_diagnostic_manager().initialize(can_bus_manager.get_can_devices().front());
 
                ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
                return 1;