From d91f5f743bc6f6ec9aadfe96187b45dc93043f61 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 16 May 2017 17:37:07 +0200 Subject: Include diagnostic_message_t into can_message_set. Change-Id: I7372e469752dd8e90dc9431b9e5c67df12f56c29 Signed-off-by: Romain Forlot --- CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp | 5 +++++ CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'CAN-binder/low-can-binding/diagnostic') diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp index a7207ae..9459de6 100644 --- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp +++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.cpp @@ -80,6 +80,11 @@ void diagnostic_message_t::set_supported(bool value) supported_ = value; } +void diagnostic_message_t::set_parent(can_message_set_t* parent) +{ + parent_ = parent; +} + /// /// @brief Build a DiagnosticRequest struct to be passed /// to diagnostic manager instance. diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp index e49acd9..675e189 100644 --- a/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp +++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-message.hpp @@ -21,6 +21,7 @@ #include #include "uds/uds.h" +#include "../can/can-message-set.hpp" #include "../can/can-message.hpp" #include "active-diagnostic-request.hpp" @@ -38,12 +39,15 @@ enum UNIT { INVALID }; +class can_message_set_t; + /// /// @brief - A representation of an OBD-II PID. /// class diagnostic_message_t { private: + can_message_set_t* parent_; /*!< parent_ - Pointer to the CAN message set holding this diagnostic message */ 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 */ @@ -72,7 +76,7 @@ class diagnostic_message_t bool get_supported() const; void set_supported(bool value); - + void set_parent(can_message_set_t* parent); const DiagnosticRequest build_diagnostic_request(); bool is_obd2_response(const can_message_t& can_message); -- cgit 1.2.3-korg