Fix diagnostic message name mismatch at decoding.

[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 f18282f..cb9b1d0 100644 (file)
--- a/src/diagnostic/active-diagnostic-request.hpp
+++ b/src/diagnostic/active-diagnostic-request.hpp
@@ -56,7 +56,7 @@ typedef void (*DiagnosticResponseCallback)(const active_diagnostic_request_t* re
  */
 class active_diagnostic_request_t {
 private:
-       std::shared_ptr<can_bus_dev_t> bus_; /*!< bus_ - The CAN bus this request should be made on, or is currently in flight-on*/
+       std::string 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.*/
@@ -82,16 +82,18 @@ private:
 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(std::shared_ptr<can_bus_dev_t> bus, DiagnosticRequest* request,
+       active_diagnostic_request_t(const std::string& 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();
+       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;
        static std::string& get_prefix();
        DiagnosticResponseDecoder& get_decoder();