Implement check of supported diagnostic PID.

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

diff --git a/src/diagnostic/diagnostic-message.hpp b/src/diagnostic/diagnostic-message.hpp
index 534b9a5..ae37d7d 100644 (file)
--- a/src/diagnostic/diagnostic-message.hpp
+++ b/src/diagnostic/diagnostic-message.hpp
@@ -22,6 +22,7 @@
 #include "uds/uds.h"
 #include "../can/can-bus.hpp"
 #include "../can/can-message.hpp"
+#include "active-diagnostic-request.hpp"
 
 #include "../low-can-binding.hpp"
 
@@ -42,32 +43,39 @@ enum UNIT {
 /**
  * @brief - A representation of an OBD-II PID.
  */
-class obd2_signal_t {
+class diagnostic_message_t {
        private:
                uint8_t pid_; /*!< pid - The 1 byte PID.*/
                std::string generic_name_; /*!< generic_name_ - A human readable name to use for this PID when published.*/
-               std::string prefix_ = "diagnostic_messages."; /*!< 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.*/
                int min_; /*!< min_ - Minimum value that can take this pid */
                int max_; /*!< max_ - Maximum value that can take this pid */
                enum UNIT unit_; /*!< unit_ : Which unit system is used by that pid. See enum UNIT above.*/
-               int frequency_; /*!< frequency - The frequency to request this PID if supported by the vehicle when automatic, recurring OBD-II requests are enabled.*/
+               float frequency_; /*!< frequency - The frequency to request this PID if supported by the vehicle when automatic, recurring OBD-II requests are enabled.*/
+               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.*/
+               DiagnosticResponseCallback callback_; /*!< callback_ - An optional DiagnosticResponseCallback to be notified whenever a
+                                                                                          * response is received for this request.*/
+               
                bool supported_; /*!< supported_ - boolean indicating whether this pid is supported by the vehicle or not.*/
 
        public:
                const char* generic_name = generic_name_.c_str();
-               obd2_signal_t(uint8_t pid, const char* generic_name, const int min_, const int max_, enum UNIT unit, int frequency, bool supported);
+               diagnostic_message_t(uint8_t pid, const std::string generic_name, const int min, const int max, enum UNIT unit, float frequency,
+                                                                                       DiagnosticResponseDecoder decoder, DiagnosticResponseCallback callback, bool supported);
 
                uint32_t get_pid();
-               std::string& get_generic_name();
-               std::string get_name();
+               const std::string& get_generic_name() const;
+               const std::string get_name() const;
+               float get_frequency() const;
+               DiagnosticResponseDecoder get_decoder() const;
+               DiagnosticResponseCallback get_callback() const;
+               bool get_supported() const;
 
-               void set_prefix(std::string val);
-               void add_request(int pid);
+               void set_supported(bool value);
 
-               bool is_obd2_response(can_message_t can_message);
-               bool is_obd2_request(DiagnosticRequest *request);
-               bool is_obd2_signal(const char *name);
+               const DiagnosticRequest build_diagnostic_request();
 
-               float decode_obd2_response(const DiagnosticResponse* response, float parsedPayload);
-};
\ No newline at end of file
+               bool is_obd2_response(const can_message_t& can_message);
+               bool is_obd2_request(const DiagnosticRequest *request);
+};