X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdiagnostic%2Fdiagnostic-manager.cpp;h=31eed0e2423716c7c7f623ba34fd0fcce4508cdd;hb=53cd923a034162273fea2f4fb045b28686f51df5;hp=6cf220c17664c9e242ba366750ade9a3498aa039;hpb=ca722832efce48e92842b246eb5831c58e7a8d8e;p=apps%2Flow-level-can-service.git

diff --git a/src/diagnostic/diagnostic-manager.cpp b/src/diagnostic/diagnostic-manager.cpp
index 6cf220c..31eed0e 100644
--- a/src/diagnostic/diagnostic-manager.cpp
+++ b/src/diagnostic/diagnostic-manager.cpp
@@ -33,10 +33,10 @@ diagnostic_manager_t::diagnostic_manager_t()
 	: initialized_{false}
 {}
 
-bool diagnostic_manager_t::initialize(std::shared_ptr<can_bus_dev_t> cbd)
+bool diagnostic_manager_t::initialize()
 {
 	// Mandatory to set the bus before intiliaze shims.
-	bus_ = cbd;
+	bus_ = configuration_t::instance().get_diagnostic_bus();
 
 	init_diagnostic_shims();
 	reset();
@@ -153,7 +153,7 @@ active_diagnostic_request_t* diagnostic_manager_t::find_recurring_request(const
 
 std::shared_ptr<can_bus_dev_t> diagnostic_manager_t::get_can_bus_dev()
 {
-	return bus_;
+	return can_bus_t::get_can_device(bus_);
 }
 
 bool diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::string name,
@@ -178,7 +178,7 @@ bool diagnostic_manager_t::add_request(DiagnosticRequest* request, const std::st
 
 			find_and_erase(entry, non_recurring_requests_);
 			DEBUG(binder_interface, "Added one-time diagnostic request on bus %s: %s",
-					bus_->get_device_name(), request_string);
+					bus_, request_string);
 
 			non_recurring_requests_.push_back(entry);
 	}
@@ -227,7 +227,7 @@ bool diagnostic_manager_t::add_recurring_request(DiagnosticRequest* request, con
 					sizeof(request_string));
 
 			DEBUG(binder_interface, "add_recurring_request: Added recurring diagnostic request (freq: %f) on bus %s: %s",
-					frequencyHz, bus_->get_device_name().c_str(), request_string);
+					frequencyHz, bus_.c_str(), request_string);
 
 			uint64_t usec;
 			sd_event_now(afb_daemon_get_event_loop(binder_interface->daemon), CLOCK_MONOTONIC, &usec);
@@ -254,29 +254,6 @@ bool diagnostic_manager_t::add_recurring_request(DiagnosticRequest* request, con
 	return added;
 }
 
-bool diagnostic_manager_t::is_diagnostic_response(const active_diagnostic_request_t& adr, const can_message_t& cm) const
-{
-	if(cm.get_id() == adr.get_id() + DIAGNOSTIC_RESPONSE_ARBITRATION_ID_OFFSET)
-		return true;
-	DEBUG(binder_interface, "Doesn't find an active diagnostic request that matches.");
-	return false;
-}
-
-active_diagnostic_request_t* diagnostic_manager_t::is_diagnostic_response(const can_message_t& can_message)
-{
-	for (auto& entry : non_recurring_requests_)
-	{
-		if(is_diagnostic_response(*entry, can_message))
-			return entry;
-	}
-
-	for (auto& entry : recurring_requests_)
-	{
-		if(is_diagnostic_response(*entry, can_message))
-			return entry;
-	}
-	return nullptr;
-}
 
 openxc_VehicleMessage diagnostic_manager_t::relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response) const
 {
@@ -343,7 +320,7 @@ int diagnostic_manager_t::send_request(sd_event_source *s, uint64_t usec, void *
 
 //	if(adr != nullptr && adr->get_can_bus_dev() == dm.get_can_bus_dev() && adr->should_send() &&
 //		dm.clear_to_send(adr))
-	if(adr != nullptr && adr->get_can_bus_dev() == dm.bus_)
+	if(adr != nullptr && adr->get_can_bus_dev() == dm.get_can_bus_dev())
 	{
 		adr->get_frequency_clock().tick();
 		start_diagnostic_request(&dm.shims_, adr->get_handle());
@@ -369,6 +346,21 @@ int diagnostic_manager_t::send_request(sd_event_source *s, uint64_t usec, void *
 	return -1;
 }
 
+
+/// @brief Tell if the CAN message received is a diagnostic response.
+/// Request broadcast ID use 0x7DF and assigned ID goes from 0x7E0 to Ox7E7. That allows up to 8 ECU to respond 
+/// at the same time. The response is the assigned ID + 0x8, so response ID can goes from 0x7E8 to 0x7EF.
+///
+/// @param[in] cm - CAN message received from the socket.
+///
+/// @return True if the active diagnostic request match the response.
+bool diagnostic_manager_t::is_diagnostic_response(const can_message_t& cm)
+{
+	if (cm.get_id() >= 0x7e8 && cm.get_id() <= 0x7ef)
+			return true;
+	return false;
+}
+
 DiagnosticShims& diagnostic_manager_t::get_shims()
 {
 	return shims_;
@@ -376,15 +368,20 @@ DiagnosticShims& diagnostic_manager_t::get_shims()
 
 bool diagnostic_manager_t::shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size)
 {
-	std::shared_ptr<can_bus_dev_t> can_bus_dev = configuration_t::instance().get_diagnostic_manager().get_can_bus_dev();
+	std::shared_ptr<can_bus_dev_t> can_bus_dev = can_bus_t::get_can_device(configuration_t::instance().get_diagnostic_manager().bus_);
 	return can_bus_dev->shims_send(arbitration_id, data, size);
 }
 
-void diagnostic_manager_t::shims_logger(const char* m, ...)
+void diagnostic_manager_t::shims_logger(const char* format, ...)
 {
-	DEBUG(binder_interface, "%s", m);
+	va_list args;
+	va_start(args, format);
+
+	char buffer[256];
+	vsnprintf(buffer, 256, format, args);
+
+	DEBUG(binder_interface, "shims_logger: %s", buffer);
 }
 
 void diagnostic_manager_t::shims_timer()
 {}
-