X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fdiagnostic%2Fdiagnostic-manager.hpp;h=26c869e24a98376254d7fb207c49a0bf93388fe4;hb=refs%2Fchanges%2F51%2F18751%2F3;hp=3edb2b12ab13affa80030e7a23449bc3b32b20d2;hpb=9e444ade872bc436cf12bc12d03c3a5d51ac0b9e;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/diagnostic/diagnostic-manager.hpp b/low-can-binding/diagnostic/diagnostic-manager.hpp
index 3edb2b12..26c869e2 100644
--- a/low-can-binding/diagnostic/diagnostic-manager.hpp
+++ b/low-can-binding/diagnostic/diagnostic-manager.hpp
@@ -21,31 +21,26 @@
 #include <map>
 #include <vector>
 
+#include "../utils/socketcan-bcm.hpp"
 #include "uds/uds.h"
 #include "openxc.pb.h"
 #include "../can/can-bus.hpp"
 #include "active-diagnostic-request.hpp"
 
-///  Each CAN bus needs its own set of shim functions, so this should
+///  Each CAN bus requires 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 by the binding.
+/// @brief The core structure for running the diagnostics module of the binding.
 ///
 /// This stores details about the active requests and shims required to connect
 /// the diagnostics library to the CAN device.
 ///
 class diagnostic_manager_t {
-protected:
-	static bool shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size);
-	static void shims_logger(const char* m, ...);
-	static void shims_timer();
-
 private:
 	DiagnosticShims shims_; /*!< shims_ - Shim functions for each CAN bus that plug the diagnostics
 							 * library (uds-c) into the VI's CAN peripheral.*/
@@ -58,42 +53,38 @@ private:
 
 	void init_diagnostic_shims();
 	void reset();
+
+	static bool shims_send(const uint32_t arbitration_id, const uint8_t* data, const uint8_t size);
+	static void shims_logger(const char* m, ...);
 public:
 	diagnostic_manager_t();
+	~diagnostic_manager_t();
 
 	bool initialize();
 
-	std::shared_ptr<can_bus_dev_t> get_can_bus_dev();
+	const std::string get_bus_name() const;
+	const std::string get_bus_device_name() const;
+	active_diagnostic_request_t* get_last_recurring_requests() const;
 	DiagnosticShims& get_shims();
 
 	void find_and_erase(active_diagnostic_request_t* entry, std::vector<active_diagnostic_request_t*>& requests_list);
 	void cancel_request(active_diagnostic_request_t* entry);
 	void cleanup_request(active_diagnostic_request_t* entry, bool force);
 	void cleanup_active_requests(bool force);
-	active_diagnostic_request_t* find_recurring_request(const DiagnosticRequest* request);
-
-	void checkSupportedPids(const active_diagnostic_request_t& request,
-		const DiagnosticResponse& response, float parsedPayload);
+	active_diagnostic_request_t* find_recurring_request(DiagnosticRequest& request);
 
 	// Subscription parts
-	bool add_request(DiagnosticRequest* request, const std::string name,
+	/*active_diagnostic_request_t* add_request(DiagnosticRequest* request, const std::string& name,
 		bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
-		const DiagnosticResponseCallback callback);
+		const DiagnosticResponseCallback callback);*/
 	bool validate_optional_request_attributes(float frequencyHz);
-	bool add_recurring_request(DiagnosticRequest* request, const char* name,
+	active_diagnostic_request_t* 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;
-	int reschedule_request(sd_event_source *s, uint64_t usec, active_diagnostic_request_t* adr);
-	static int send_request(sd_event_source *s, uint64_t usec, void *userdata);
+		const DiagnosticResponseCallback callback, float frequencyHz, bool permanent);
 
 	// Decoding part
-	openxc_VehicleMessage relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response);
+	openxc_VehicleMessage relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response, const uint64_t timestamp);
 	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);
-
 };