X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fdiagnostic%2Fdiagnostic-message.cpp;h=69ca4e34f365673c7074ce5634f7ded4204fe039;hb=6faef2305955b025c3cf1cfaf17a6aa073727c24;hp=6f6155745daa1bc0958b83dc520f43935d85de16;hpb=9e444ade872bc436cf12bc12d03c3a5d51ac0b9e;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/diagnostic/diagnostic-message.cpp b/low-can-binding/diagnostic/diagnostic-message.cpp index 6f615574..69ca4e34 100644 --- a/low-can-binding/diagnostic/diagnostic-message.cpp +++ b/low-can-binding/diagnostic/diagnostic-message.cpp @@ -18,7 +18,7 @@ #include "diagnostic-message.hpp" -#include "../configuration.hpp" +#include "../binding/application.hpp" #include "../utils/signals.hpp" const char *UNIT_NAMES[10] = { @@ -34,10 +34,10 @@ const char *UNIT_NAMES[10] = { "NM" }; -diagnostic_message_t::diagnostic_message_t(uint8_t pid, const std::string generic_name, const int min, +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}, + : parent_{nullptr}, pid_{pid}, generic_name_{generic_name}, min_{min}, max_{max}, unit_{unit}, frequency_{frequency}, decoder_{decoder}, callback_{callback}, supported_{supported} {} @@ -46,7 +46,7 @@ uint32_t diagnostic_message_t::get_pid() return (uint32_t)pid_; } -const std::string& diagnostic_message_t::get_generic_name() const +const std::string diagnostic_message_t::get_generic_name() const { return generic_name_; } @@ -80,11 +80,16 @@ 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. /// -const DiagnosticRequest diagnostic_message_t::build_diagnostic_request() + const DiagnosticRequest diagnostic_message_t::build_diagnostic_request() const { return {/*arbitration_id: */OBD2_FUNCTIONAL_BROADCAST_ID, /*mode: */0x1,