X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fdiagnostic%2Fdiagnostic-manager.hpp;h=c66e21a5f091ea200c5f0c1f580245b9b8518516;hb=20336cf43a6b312cd03f76dbe68333db18122bd6;hp=29223fa0a610f53682a8e6687e9478576916f811;hpb=95d91c64f891ece71fa196178345bacf9e3967d6;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/diagnostic/diagnostic-manager.hpp b/src/diagnostic/diagnostic-manager.hpp
index 29223fa0..c66e21a5 100644
--- a/src/diagnostic/diagnostic-manager.hpp
+++ b/src/diagnostic/diagnostic-manager.hpp
@@ -18,28 +18,27 @@
 #pragma once
 
 #include <systemd/sd-event.h>
-#include <queue>
+#include <map>
 #include <vector>
 
 #include "uds/uds.h"
-#include "../can/can-bus-dev.hpp"
-#include "../can/can-message.hpp"
+#include "openxc.pb.h"
+#include "../can/can-bus.hpp"
 #include "active-diagnostic-request.hpp"
 
-#include "../low-can-binding.hpp"
-
-/* Private: Each CAN bus needs its own set of shim functions, so this should
+/*  Each CAN bus needs its own set of shim functions, so this should
  * match the maximum CAN controller count.
  */
 #define MAX_SHIM_COUNT can_bus_t.get_can_devices().size()
+#define DIAGNOSTIC_RESPONSE_ARBITRATION_ID_OFFSET 0x8
 
 class active_diagnostic_request_t;
 
 /**
- * @brief The core structure for running the diagnostics module on the VI.
+ * @brief The core structure for running the diagnostics module by the binding.
  *
  * @desc This stores details about the active requests and shims required to connect
- * the diagnostics library to the VI's CAN peripheral.
+ * the diagnostics library to the CAN device.
  */
 class diagnostic_manager_t {
 protected:
@@ -48,21 +47,13 @@ protected:
 	static void shims_timer();
 
 private:
-	DiagnosticShims shims_; /*!< shims_ - An array of shim functions for each CAN bus that plug the diagnostics
+	DiagnosticShims shims_; /*!< shims_ - Shim functions for each CAN bus that plug the diagnostics
 							 * library (uds-c) into the VI's CAN peripheral.*/
-	std::shared_ptr<can_bus_dev_t> bus_; /*!< bus_ - A pointer to the CAN bus that should be used for all standard OBD-II requests, if the bus is not
-						  * explicitly spcified in the request. If NULL, all requests require an explicit bus.*/
-	std::vector<active_diagnostic_request_t*> recurring_requests_; /*!< recurringRequests - A queue of active, recurring diagnostic requests. When
-																  * a response is received for a recurring request or it times out, it is
-																  * popped from the queue and pushed onto the back. */
+	std::string bus_; /*!< bus_ - A pointer to the CAN bus that should be used for all standard OBD-II requests, if the bus is not
+						* explicitly spcified in the request. Default to the first bus CAN at initialization.*/
+	std::vector<active_diagnostic_request_t*> recurring_requests_; /*!< recurringRequests - A list of active recurring diagnostic requests.*/
 	std::vector<active_diagnostic_request_t*> non_recurring_requests_; /*!< nonrecurringRequests - A list of active one-time diagnostic requests. When a
-																	   * response is received for a non-recurring request or it times out, it is
-																	   * removed from this list and placed back in the free list.*/
-	std::vector<active_diagnostic_request_t*> free_request_entries_; /*!< freeRequestEntries - A list of all available slots for active diagnostic
-																	 * requests. This free list is backed by statically allocated entries in
-																	 * the requestListEntries attribute.*/
-	std::vector<active_diagnostic_request_t*> request_list_entries_; /*!< requestListEntries - Static allocation for all active diagnostic requests.*/
-
+																	   * response is received for a non-recurring request or it times out, it is removed*/
 	bool initialized_; /*!< * initialized - True if the DiagnosticsManager has been initialized with shims. It will interface with the uds-c lib*/
 
 	void init_diagnostic_shims();
@@ -70,10 +61,9 @@ private:
 public:
 	diagnostic_manager_t();
 
-	bool initialize(std::shared_ptr<can_bus_dev_t> cbd);
+	bool initialize();
 
 	std::shared_ptr<can_bus_dev_t> get_can_bus_dev();
-	active_diagnostic_request_t* get_free_entry();
 	DiagnosticShims& get_shims();
 
 	void find_and_erase(active_diagnostic_request_t* entry, std::vector<active_diagnostic_request_t*>& requests_list);
@@ -82,20 +72,27 @@ public:
 	void cleanup_active_requests(bool force);
 	active_diagnostic_request_t* find_recurring_request(const DiagnosticRequest* request);
 
-	bool validate_optional_request_attributes(float frequencyHz);
-
 	void checkSupportedPids(const active_diagnostic_request_t& request,
 		const DiagnosticResponse& response, float parsedPayload);
 
+	// Subscription parts
 	bool add_request(DiagnosticRequest* request, const std::string name,
 		bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
 		const DiagnosticResponseCallback callback);
-
+	bool validate_optional_request_attributes(float frequencyHz);
 	bool add_recurring_request(DiagnosticRequest* request, const char* name,
 		bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
 		const DiagnosticResponseCallback callback, float frequencyHz);
-	
+
+	// Sendig requests part
 	bool conflicting(active_diagnostic_request_t* request, active_diagnostic_request_t* candidate) const;
 	bool clear_to_send(active_diagnostic_request_t* request) const;
 	static int send_request(sd_event_source *s, uint64_t usec, void *userdata);
+
+	// Decoding part
+	openxc_VehicleMessage relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response);
+	openxc_VehicleMessage relay_diagnostic_handle(active_diagnostic_request_t* entry, const can_message_t& cm);
+	openxc_VehicleMessage find_and_decode_adr(const can_message_t& cm);
+	bool is_diagnostic_response(const can_message_t& cm);
+
 };