#include "can/can-message.hpp"
#include "utils/timer.hpp"
#include "utils/signals.hpp"
-#include "obd2/obd2-signals.hpp"
+#include "diagnostic/diagnostic-message.hpp"
#include "utils/openxc-utils.hpp"
extern "C"
int ret;
if (active_diagnostic_request_t::is_diagnostic_signal(sig) && subscribe)
{
- std::vector<obd2_signal_t*> found;
- configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found);
- int frequency = found.front()->get_frequency();
+ std::vector<diagnostic_message_t*> found;
+ configuration_t::instance().find_diagnostic_messages(build_DynamicField(sig), found);
+ float frequency = found.front()->get_frequency();
DiagnosticRequest* diag_req = new DiagnosticRequest(found.front()->build_diagnostic_request());
configuration_t::instance().get_diagnostic_manager().add_recurring_request(
- diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, nullptr, (float)frequency);
- //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, obd2_signal_t::check_ignition_status, frequency);
+ diag_req, sig.c_str(), false, found.front()->get_decoder(), found.front()->get_callback(), (float)frequency);
+ //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, diagnostic_message_t::decode_obd2_response, diagnostic_message_t::check_ignition_status, frequency);
}
ret = subscribe_unsubscribe_signal(request, subscribe, sig);
/// 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.
- if(configuration_t::instance().get_diagnostic_manager().initialize(can_bus_manager.get_can_devices().front()))
+ if(configuration_t::instance().get_diagnostic_manager().initialize())
return 0;
ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");