diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 15:51:19 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 18:04:58 +0200 |
| commit | 2f60d294b3fa4e243fa67a738f9b82a0b428a7fc (patch) | |
| tree | ed6b50772964ce360eb2a0ebeadac29a8fb9ed2c /low-can-binding/diagnostic | |
| parent | d2180abe18533be7cbe68971a6767e5c2a0ecf6d (diff) | |
Rename some of the classes removing can- prefix
This commit renames files and classes :
- can_message_definition_t -> message_definition_t
- can_message_set_t -> message_set_t
- can_signals_t -> signals_t
This prepares the implementation of j1939 protocol.
Bug-AGL: SPEC-2386
Change-Id: Ie3ee4f25c236c861b92eb12a56fa03a5a9afffbb
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/diagnostic')
| -rw-r--r-- | low-can-binding/diagnostic/diagnostic-manager.cpp | 2 | ||||
| -rw-r--r-- | low-can-binding/diagnostic/diagnostic-message.cpp | 2 | ||||
| -rw-r--r-- | low-can-binding/diagnostic/diagnostic-message.hpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/low-can-binding/diagnostic/diagnostic-manager.cpp b/low-can-binding/diagnostic/diagnostic-manager.cpp index 7c067c6a..fa1d87af 100644 --- a/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -526,7 +526,7 @@ openxc_VehicleMessage diagnostic_manager_t::find_and_decode_adr(std::shared_ptr< /// @return True if the active diagnostic request match the response. bool diagnostic_manager_t::is_diagnostic_response(std::shared_ptr<message_t> m) { - if(m->get_msg_format() == can_message_format_t::STANDARD || m->get_msg_format() == can_message_format_t::EXTENDED) + if(m->get_msg_format() == message_format_t::STANDARD || m->get_msg_format() == message_format_t::EXTENDED) { if (m->get_id() >= 0x7e8 && m->get_id() <= 0x7ef) return true; diff --git a/low-can-binding/diagnostic/diagnostic-message.cpp b/low-can-binding/diagnostic/diagnostic-message.cpp index 6ebb6ab1..9b4733da 100644 --- a/low-can-binding/diagnostic/diagnostic-message.cpp +++ b/low-can-binding/diagnostic/diagnostic-message.cpp @@ -114,7 +114,7 @@ void diagnostic_message_t::set_supported(bool value) supported_ = value; } -void diagnostic_message_t::set_parent(std::shared_ptr<can_message_set_t> parent) +void diagnostic_message_t::set_parent(std::shared_ptr<message_set_t> parent) { parent_ = parent; } diff --git a/low-can-binding/diagnostic/diagnostic-message.hpp b/low-can-binding/diagnostic/diagnostic-message.hpp index 86149413..e7877d6e 100644 --- a/low-can-binding/diagnostic/diagnostic-message.hpp +++ b/low-can-binding/diagnostic/diagnostic-message.hpp @@ -21,7 +21,7 @@ #include <string> #include "uds/uds.h" -#include "../can/can-message-set.hpp" +#include "../can/message-set.hpp" #include "../can/message/can-message.hpp" #include "active-diagnostic-request.hpp" @@ -45,7 +45,7 @@ class message_set_t; class diagnostic_message_t { private: - std::shared_ptr<can_message_set_t> parent_; /*!< parent_ - Pointer to the CAN message set holding this diagnostic message */ + std::shared_ptr<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 */ @@ -97,7 +97,7 @@ class diagnostic_message_t void set_timestamp(uint64_t timestamp); void set_supported(bool value); - void set_parent(std::shared_ptr<can_message_set_t> parent); + void set_parent(std::shared_ptr<message_set_t> parent); const DiagnosticRequest build_diagnostic_request() const; bool is_obd2_response(const can_message_t& can_message); |