X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdiagnostic%2Fdiagnostic-message.hpp;h=064904d2cd43d0338dd5f23a008f7f0bdd755e14;hb=7591838644a3fcb5145b9ccc7200166debe7ba87;hp=5ca651c333e4f2a9a6eb9d950fd7838a1abb8da4;hpb=8871f8ae696035877afcbb3b089fc06219c2ba3a;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/diagnostic/diagnostic-message.hpp b/src/diagnostic/diagnostic-message.hpp
index 5ca651c3..064904d2 100644
--- a/src/diagnostic/diagnostic-message.hpp
+++ b/src/diagnostic/diagnostic-message.hpp
@@ -18,12 +18,11 @@
 #pragma once
 
 #include <vector>
+#include <string>
 
 #include "uds/uds.h"
-#include "../can/can-bus.hpp"
 #include "../can/can-message.hpp"
-
-#include "../low-can-binding.hpp"
+#include "active-diagnostic-request.hpp"
 
 enum UNIT {
 	POURCENT,
@@ -39,54 +38,42 @@ enum UNIT {
 	INVALID
 };
 
-/**
- *	@brief A representation of an OBD-II PID.
- *
- * pid - The 1 byte PID.
- * name - A human readable name to use for this PID when published.
- * min - minimum value for this pid
- * max - maximum value for this pid
- * unit - unit used
- * frequency - The frequency to request this PID if supported by the vehicle
- *		when automatic, recurring OBD-II requests are enabled.
- *	supported - is it supported by the vehicle. Initialized after scan
- */
-typedef struct _Obd2Pid {
-	uint8_t pid;
-	const char* generic_name;
-	const int min;
-	const int max;
-	enum UNIT unit;
-	int frequency;
-	bool supported;
-} Obd2Pid;
-
-/**
- * @brief - Object to handle obd2 session with pre-scan of supported pid
- * then request them regularly
- */
-class obd2_signal_t {
+///
+/// @brief - A representation of an OBD-II PID.
+///
+class diagnostic_message_t {
 	private:
-		uint8_t pid_; /*!< pid - The 1 byte PID.*/
+		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.*/
 		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();
+		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 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);
+};