diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-03-13 23:08:43 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-16 17:15:55 +0100 |
| commit | ac96a95e79d89eb667276f87c389d5ea4ff14efd (patch) | |
| tree | 2102b03c3ad3bde2ba6ffa6b8f9ed2348e78cc70 /src/can/can-signals.cpp | |
| parent | 63d31e29e366fb9dd85debc897fdbc91d9cb2e42 (diff) | |
Implement signals states decoder and change map
to a vector.
Change-Id: I185724f2966fecac6659d401751da56d2886ed9d
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can/can-signals.cpp')
| -rw-r--r-- | src/can/can-signals.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp index b7b311be..d04c03ae 100644 --- a/src/can/can-signals.cpp +++ b/src/can/can-signals.cpp @@ -29,7 +29,7 @@ std::string can_signal_t::prefix_ = "messages"; can_signal_t::can_signal_t(can_message_definition_t& message, std::string generic_name, uint8_t bit_position, uint8_t bit_size, float factor, float offset, float min_value, float max_value, frequency_clock_t frequency, bool send_same, bool force_send_changed, - std::map<int, std::string> states, bool writable, SignalDecoder decoder, SignalEncoder encoder, bool received) + std::vector<std::string> states, bool writable, SignalDecoder decoder, SignalEncoder encoder, bool received) : message_{message}, generic_name_{generic_name}, bit_position_{bit_position}, bit_size_{bit_size}, factor_{factor}, offset_{offset}, min_value_{min_value}, max_value_{max_value}, frequency_{frequency}, send_same_{send_same}, force_send_changed_{force_send_changed}, states_{states}, writable_{writable}, decoder_{decoder}, encoder_{encoder}, received_{received}, last_value_{(float)NULL} @@ -100,11 +100,18 @@ bool can_signal_t::get_force_send_changed() const return force_send_changed_; } -std::map<int, std::string> can_signal_t::get_state() const +const std::vector<std::string>& can_signal_t::get_states() const { return states_; } +const std::string can_signal_t::get_states(float value) const +{ + if (value < states_.size()) + return states_[(int)value]; + return std::string(""); +} + size_t can_signal_t::get_state_count() const { return states_.size(); |