Simplification of checking Diagnostic response.

[apps/agl-service-can-low-level.git] / src / diagnostic / diagnostic-manager.hpp

diff --git a/src/diagnostic/diagnostic-manager.hpp b/src/diagnostic/diagnostic-manager.hpp
index 71662ba..1db8363 100644 (file)
--- a/src/diagnostic/diagnostic-manager.hpp
+++ b/src/diagnostic/diagnostic-manager.hpp
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <systemd/sd-event.h>
+#include <map>
 #include <vector>
 
 #include "uds/uds.h"
@@ -49,10 +50,10 @@ protected:
        static void shims_timer();
 
 private:
-       DiagnosticShims shims_; /*!< shims_ - An array of 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.*/
+       DiagnosticShims shims_; /*!< shims_ - A map of shim functions for each CAN bus that plug the diagnostics
+                                                                                                       * library (uds-c) into the VI's CAN peripheral.*/
+       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*/
@@ -63,7 +64,7 @@ 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();
        DiagnosticShims& get_shims();
@@ -87,12 +88,11 @@ public:
                bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
                const DiagnosticResponseCallback callback, float frequencyHz);
        
-       bool is_diagnostic_response(const active_diagnostic_request_t& adr, const can_message_t& cm) const;
-       active_diagnostic_request_t* is_diagnostic_response(const can_message_t& can_message);
 
        openxc_VehicleMessage relay_diagnostic_response(active_diagnostic_request_t* adr, const DiagnosticResponse& response) const;
 
        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);
+       bool is_diagnostic_response(const can_message_t& cm);
 };