diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-03-15 17:58:50 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-16 17:21:57 +0100 |
| commit | daa713ab23d8bb8192fc4e86aaf6720e830cdab9 (patch) | |
| tree | de993ce8872cf611bd2910bce5c07b16c8b4225c /src/can/can-signals.cpp | |
| parent | 1d464d2a7380248b04c3e734ed5c6e84bbf53ddf (diff) | |
Improve memory allocation about Signal states.
Returning to Signal states map avoiding hole in vector allocation as we did
not know how many state a Signal can takes. So a map may be a better choice
Will see.
Change-Id: Ie3ccdbd31296c5c0ebaefc109e75f2e0cde03756
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp index d04c03ae..41949fce 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::vector<std::string> states, bool writable, SignalDecoder decoder, SignalEncoder encoder, bool received) + std::map<uint8_t, 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,16 +100,16 @@ bool can_signal_t::get_force_send_changed() const return force_send_changed_; } -const std::vector<std::string>& can_signal_t::get_states() const +const std::map<uint8_t, std::string>& can_signal_t::get_states() const { return states_; } -const std::string can_signal_t::get_states(float value) const +const std::string can_signal_t::get_states(uint8_t value) { if (value < states_.size()) - return states_[(int)value]; - return std::string(""); + return states_[value]; + return std::string(); } size_t can_signal_t::get_state_count() const |