Fix: Initialization and entries flow

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

diff --git a/src/diagnostic/active-diagnostic-request.hpp b/src/diagnostic/active-diagnostic-request.hpp
index 88d4008..74a969b 100644 (file)
--- a/src/diagnostic/active-diagnostic-request.hpp
+++ b/src/diagnostic/active-diagnostic-request.hpp
@@ -62,6 +62,8 @@ private:
                                                                                * sending the frames of the request and receiving all frames of the response.*/
        std::string name_; /*!< name_ - An optional human readable name this response, to be used when publishing received 
                                                * responses. If the name is NULL, the published output will use the raw OBD-II response format.*/
+       static std::string prefix_; /*!< prefix_ - generic_name_ will be prefixed with it. It has to reflect the used protocol.
+                                                                * which make easier to sort message when the come in.*/
        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
                                                                                        * instead of a parsed value.*/
@@ -82,20 +84,30 @@ public:
        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 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);
        
+       uint32_t get_id() const;
        std::shared_ptr<can_bus_dev_t> get_can_bus_dev();
        DiagnosticRequestHandle* get_handle();
+       std::string& get_name();
+       static std::string& get_prefix();
+       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();
        
        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();