2 files changed, 30 insertions, 12 deletions

diff --git a/src/diagnostic/diagnostic-message.cpp b/src/diagnostic/diagnostic-message.cpp
index a460ac5c..b7c5d45a 100644
--- a/src/diagnostic/diagnostic-message.cpp
+++ b/src/diagnostic/diagnostic-message.cpp
@@ -33,36 +33,45 @@ const char *UNIT_NAMES[10] = {
 	"NM"
 };
 
-obd2_signal_t::obd2_signal_t(uint8_t pid, const char* generic_name, const int min, const int max, enum UNIT unit, int frequency, bool supported)
-	:	pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit}, frequency_{frequency}, supported_{supported}
-{
-}
+diagnostic_message_t::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)
+	: pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit}, frequency_{frequency}, decoder_{decoder}, callback_{callback}, supported_{supported}
+{}
 
-uint32_t obd2_signal_t::get_pid()
+uint32_t diagnostic_message_t::get_pid()
 {
 	return (uint32_t)pid_;
 }
 
-const std::string& obd2_signal_t::get_generic_name() const
+const std::string& diagnostic_message_t::get_generic_name() const
 {
 	return generic_name_;
 }
 
-const std::string obd2_signal_t::get_name() const
+const std::string diagnostic_message_t::get_name() const
 {
 	return active_diagnostic_request_t::get_prefix() + "." + generic_name_;
 }
 
-int obd2_signal_t::get_frequency() const
+float diagnostic_message_t::get_frequency() const
 {
 	return frequency_;
 }
 
+DiagnosticResponseDecoder diagnostic_message_t::get_decoder() const
+{
+	return decoder_;
+}
+DiagnosticResponseCallback diagnostic_message_t::get_callback() const
+{
+	return callback_;
+}
+
 /**
  * @brief Build a DiagnosticRequest struct to be passed
  *  to diagnostic manager instance.
  */
-const DiagnosticRequest obd2_signal_t::build_diagnostic_request()
+const DiagnosticRequest diagnostic_message_t::build_diagnostic_request()
 {
 	return {/*arbitration_id: */OBD2_FUNCTIONAL_BROADCAST_ID,
 			/*mode: */0x1,
@@ -80,7 +89,7 @@ const DiagnosticRequest obd2_signal_t::build_diagnostic_request()
 *
 * @return true if the request is a mode 1 request and it has a 1 byte PID.
 */
-bool obd2_signal_t::is_obd2_request(const DiagnosticRequest* request)
+bool diagnostic_message_t::is_obd2_request(const DiagnosticRequest* request)
 {
 	return request->mode == 0x1 && request->has_pid && request->pid < 0xff;
 }
diff --git a/src/diagnostic/diagnostic-message.hpp b/src/diagnostic/diagnostic-message.hpp
index e8062579..83c4dcc2 100644
--- a/src/diagnostic/diagnostic-message.hpp
+++ b/src/diagnostic/diagnostic-message.hpp
@@ -42,7 +42,7 @@ 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.*/
@@ -50,16 +50,25 @@ class obd2_signal_t {
 		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.*/
+		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();
 		const std::string& get_generic_name() const;
 		const std::string get_name() const;
 		int get_frequency() const;
+		DiagnosticResponseDecoder get_decoder() const;
+		DiagnosticResponseCallback get_callback() const;
 
 		const DiagnosticRequest build_diagnostic_request();