Make diagnostic manager initialization processus.

[apps/low-level-can-service.git] / src / diagnostic / active-diagnostic-request.hpp

diff --git a/src/diagnostic/active-diagnostic-request.hpp b/src/diagnostic/active-diagnostic-request.hpp
index 2850663..88d4008 100644 (file)
--- a/src/diagnostic/active-diagnostic-request.hpp
+++ b/src/diagnostic/active-diagnostic-request.hpp
@@ -21,13 +21,13 @@
 
 #include "uds/uds.h"
 #include "uds/uds_types.h"
-#include "can/can-bus.hpp"
-#include "can/can-message.hpp"
+#include "../can/can-bus-dev.hpp"
+#include "../can/can-message.hpp"
 
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
 
 class active_diagnostic_request_t;
-class can_bus_dev_t;
+class diagnostic_manager_t;
 
 /* Public: The signature for an optional function that can apply the neccessary
  * formula to translate the binary payload into meaningful data.
@@ -56,7 +56,7 @@ typedef void (*DiagnosticResponseCallback)(const active_diagnostic_request_t* re
  */
 class active_diagnostic_request_t {
 private:
-       can_bus_dev_t* bus_; /*!< bus_ - The CAN bus this request should be made on, or is currently in flight-on*/
+       std::shared_ptr<can_bus_dev_t> bus_; /*!< bus_ - The CAN bus this request should be made on, or is currently in flight-on*/
        uint32_t id_; /*!< id_ - The arbitration ID (aka message ID) for the request.*/
        DiagnosticRequestHandle* handle_; /*!< handle_ - A handle for the request to keep track of it between
                                                                                * sending the frames of the request and receiving all frames of the response.*/
@@ -78,9 +78,25 @@ private:
        frequency_clock_t timeout_clock_; /*!< timeout_clock_ - A frequency_clock_t object to monitor how long it's been since
                                                                        * this request was sent.*/
 public:
+       bool operator==(const active_diagnostic_request_t& b);
+       active_diagnostic_request_t& operator=(const active_diagnostic_request_t& adr);
        active_diagnostic_request_t();
-
-       void updateDiagnosticRequestEntry(DiagnosticsManager* manager, CanBus* bus, DiagnosticRequest* request,
-               const char* name, bool waitForMultipleResponses, const DiagnosticResponseDecoder decoder,
+       active_diagnostic_request_t(active_diagnostic_request_t&&) = default;
+       //active_diagnostic_request_t(const active_diagnostic_request_t&) = default;
+       active_diagnostic_request_t(std::shared_ptr<can_bus_dev_t> bus, DiagnosticRequest* request,
+               const std::string& name, bool wait_for_multiple_responses,
+               const DiagnosticResponseDecoder decoder,
                const DiagnosticResponseCallback callback, float frequencyHz);
+       
+       std::shared_ptr<can_bus_dev_t> get_can_bus_dev();
+       DiagnosticRequestHandle* get_handle();
+       bool get_recurring() const;
+       bool get_in_flight() const;
+       
+       void set_handle(DiagnosticShims& shims, DiagnosticRequest* request);
+       void set_in_flight(bool val);
+
+       bool timed_out();
+       bool response_received() const;
+       bool request_completed();
 };