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/binding/application.cpp | |
| 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/binding/application.cpp')
| -rw-r--r-- | low-can-binding/binding/application.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/low-can-binding/binding/application.cpp b/low-can-binding/binding/application.cpp index a85b5184..5e0a6537 100644 --- a/low-can-binding/binding/application.cpp +++ b/low-can-binding/binding/application.cpp @@ -52,24 +52,24 @@ uint8_t application_t::get_active_message_set() const return active_message_set_; } -std::vector<std::shared_ptr<can_message_set_t> > application_t::get_can_message_set() +std::vector<std::shared_ptr<message_set_t> > application_t::get_message_set() { - return can_message_set_; + return message_set_; } -std::vector<std::shared_ptr<can_signal_t> > application_t::get_all_can_signals() +std::vector<std::shared_ptr<signal_t> > application_t::get_all_signals() { - return can_message_set_[active_message_set_]->get_all_can_signals(); + return message_set_[active_message_set_]->get_all_signals(); } -std::vector<std::shared_ptr<diagnostic_message_t> >& application_t::get_diagnostic_messages() +std::vector<std::shared_ptr<diagnostic_message_t> > application_t::get_diagnostic_messages() { - return can_message_set_[active_message_set_]->get_diagnostic_messages(); + return message_set_[active_message_set_]->get_diagnostic_messages(); } -std::vector<std::shared_ptr<can_message_definition_t> >& application_t::get_can_message_definition() +std::vector<std::shared_ptr<message_definition_t>> application_t::get_messages_definition() { - return can_message_set_[active_message_set_]->get_can_message_definition(); + return message_set_[active_message_set_]->get_messages_definition(); } uint32_t application_t::get_signal_id(diagnostic_message_t& sig) const @@ -77,7 +77,7 @@ uint32_t application_t::get_signal_id(diagnostic_message_t& sig) const return sig.get_pid(); } -uint32_t application_t::get_signal_id(can_signal_t& sig) const +uint32_t application_t::get_signal_id(signal_t& sig) const { return sig.get_message()->get_id(); } @@ -95,12 +95,12 @@ bool application_t::isEngineOn() bool engine_on = false; uint64_t last_timestamp_in_s; - if(sf.can_signals.size() == 1) + if(sf.signals.size() == 1) { - last_timestamp_in_s = sf.can_signals.front()->get_last_value_with_timestamp().second + last_timestamp_in_s = sf.signals.front()->get_last_value_with_timestamp().second / MICROSECONDS_IN_SECOND; - if(sf.can_signals.front()->get_last_value_with_timestamp().first > 0 && + if(sf.signals.front()->get_last_value_with_timestamp().first > 0 && std::difftime(std::time(nullptr), last_timestamp_in_s) < ENGINE_VALUE_TIMEOUT) { engine_on = true; |