Format

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

diff --git a/low-can-binding/diagnostic/active-diagnostic-request.hpp b/low-can-binding/diagnostic/active-diagnostic-request.hpp
index 247eeb1..36f9e43 100644 (file)
--- a/low-can-binding/diagnostic/active-diagnostic-request.hpp
+++ b/low-can-binding/diagnostic/active-diagnostic-request.hpp
@@ -20,10 +20,10 @@
 #include <string>
 #include <vector>
 
+#include "../utils/socketcan-bcm.hpp"
 #include "uds/uds.h"
 #include "uds/uds_types.h"
 #include "../utils/timer.hpp"
-#include "../can/can-bus-dev.hpp"
 
 class active_diagnostic_request_t;
 class diagnostic_manager_t;
@@ -67,8 +67,7 @@ private:
        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.
        std::string name_; ///< name_ - Human readable name, to be used when publishing received responses.
-                                          ///< TODO: If the name is NULL, the published output will use the raw OBD-II response format.
-       static std::string prefix_; ///< prefix_ - It has to reflect the JSON object which it comes from. It makes easier sorting 
+       static std::string prefix_; ///< prefix_ - It has to reflect the JSON object which it comes from. It makes easier sorting
                                                                ///< incoming CAN messages.
        DiagnosticResponseDecoder decoder_; ///< decoder_ - An optional DiagnosticResponseDecoder to parse the payload of responses
                                                                                ///< to this request. If the decoder is NULL, the output will include the raw payload
@@ -80,24 +79,24 @@ private:
        bool wait_for_multiple_responses_; ///< wait_for_multiple_responses_ - False by default, when any response is received for a request
                                                                           ///< it will be removed from the active list. If true, the request will remain active until the timeout
                                                                           ///< clock expires, to allow it to receive multiple response (e.g. to a functional broadcast request).
-       bool in_flight_; ///< in_flight_ - True if the request has been sent and we are waiting for a response.
        frequency_clock_t frequency_clock_; ///< frequency_clock_ - A frequency_clock_t object to control the send rate for a
                                                                                ///< recurring request. If the request is not reecurring, this attribute is not used.
        frequency_clock_t timeout_clock_; ///< timeout_clock_ - A frequency_clock_t object to monitor how long it's been since
                                                                          ///< this request was sent.
+       utils::socketcan_bcm_t socket_; ///< socket_ - A BCM socket setup to send cyclic message to CAN ID 7DF.
 public:
        bool operator==(const active_diagnostic_request_t& b);
        active_diagnostic_request_t& operator=(const active_diagnostic_request_t& adr);
 
        active_diagnostic_request_t();
        active_diagnostic_request_t(active_diagnostic_request_t&&) = default;
-       active_diagnostic_request_t(const std::string& bus, DiagnosticRequest* request,
+       active_diagnostic_request_t(const std::string& bus, uint32_t id,
                const std::string& name, bool wait_for_multiple_responses,
                const DiagnosticResponseDecoder decoder,
                const DiagnosticResponseCallback callback, float frequencyHz);
+       ~active_diagnostic_request_t();
 
        uint32_t get_id() const;
-       const std::shared_ptr<can_bus_dev_t> get_can_bus_dev() const;
        DiagnosticRequestHandle* get_handle();
        uint16_t get_pid() const;
        const std::string get_name() const;
@@ -105,18 +104,13 @@ public:
        DiagnosticResponseDecoder& get_decoder();
        DiagnosticResponseCallback& get_callback();
        bool get_recurring() const;
-       bool get_in_flight() const;
        frequency_clock_t& get_frequency_clock();
        frequency_clock_t& get_timeout_clock();
+       utils::socketcan_bcm_t& get_socket();
 
        void set_handle(DiagnosticShims& shims, DiagnosticRequest* request);
-       void set_in_flight(bool val);
 
        static bool is_diagnostic_signal(const std::string& name);
 
-       bool should_send();
-
-       bool timed_out();
        bool response_received() const;
-       bool request_completed();
 };