diff options
| -rw-r--r-- | src/can/can-decoder.cpp | 2 | ||||
| -rw-r--r-- | src/can/can-signals.cpp | 10 | ||||
| -rw-r--r-- | src/can/can-signals.hpp | 8 | ||||
| -rw-r--r-- | src/configuration-generated.cpp | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/can/can-decoder.cpp b/src/can/can-decoder.cpp index ec31e367..aef042c3 100644 --- a/src/can/can-decoder.cpp +++ b/src/can/can-decoder.cpp @@ -124,7 +124,7 @@ openxc_DynamicField decoder_t::ignoreDecoder(can_signal_t& signal, openxc_DynamicField decoder_t::stateDecoder(can_signal_t& signal, const std::vector<can_signal_t>& signals, float value, bool* send) { - const std::string signal_state = signal.get_states(value); + const std::string signal_state = signal.get_states((uint8_t)value); openxc_DynamicField decoded_value = build_DynamicField(signal_state); if(signal_state.size() <= 0) { 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 diff --git a/src/can/can-signals.hpp b/src/can/can-signals.hpp index c522d0ab..9a07f664 100644 --- a/src/can/can-signals.hpp +++ b/src/can/can-signals.hpp @@ -96,7 +96,7 @@ private: bool send_same_; /*!< send_same_ - If true, will re-send even if the value hasn't changed.*/ bool force_send_changed_; /*!< force_send_changed_ - If true, regardless of the frequency, it will send the * value if it has changed. */ - std::vector<std::string> states_; /*!< states_ - A map of CAN signal state describing the mapping + std::map<uint8_t, std::string> states_; /*!< states_ - A map of CAN signal state describing the mapping * between numerical and string values for valid states. */ bool writable_; /*!< writable - True if the signal is allowed to be written from the USB host * back to CAN. Defaults to false.*/ @@ -112,7 +112,7 @@ private: public: 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); can_message_definition_t& get_message(); const std::string& get_generic_name() const; @@ -127,8 +127,8 @@ public: frequency_clock_t& get_frequency(); bool get_send_same() const; bool get_force_send_changed() const; - const std::vector<std::string>& get_states() const; - const std::string get_states(float value) const; + const std::map<uint8_t, std::string>& get_states() const; + const std::string get_states(uint8_t value); size_t get_state_count() const; bool get_writable() const; SignalDecoder& get_decoder(); diff --git a/src/configuration-generated.cpp b/src/configuration-generated.cpp index fd2e3305..b7a3733d 100644 --- a/src/configuration-generated.cpp +++ b/src/configuration-generated.cpp @@ -52,8 +52,8 @@ std::vector<std::vector<can_message_definition_t>> CAN_MESSAGES_DEFINITION = { */ std::vector<std::vector<can_signal_t>> SIGNALS = { { - can_signal_t((CAN_MESSAGES_DEFINITION[MESSAGE_SET_ID][0]), "driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, frequency_clock_t(), false, true, std::vector<std::string>(), false, decoder_t::booleanDecoder, nullptr, false), - can_signal_t((CAN_MESSAGES_DEFINITION[MESSAGE_SET_ID][1]), "driver_door.close", 0, 4, 1.000000, 0.000000, 0.000000, 0.000000, frequency_clock_t(), false, true, std::vector<std::string>(),false, decoder_t::booleanDecoder, nullptr, false) + can_signal_t((CAN_MESSAGES_DEFINITION[MESSAGE_SET_ID][0]), "driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, frequency_clock_t(), false, true, std::map<uint8_t, std::string>(), false, decoder_t::booleanDecoder, nullptr, false), + can_signal_t((CAN_MESSAGES_DEFINITION[MESSAGE_SET_ID][1]), "driver_door.close", 0, 4, 1.000000, 0.000000, 0.000000, 0.000000, frequency_clock_t(), false, true, std::map<uint8_t, std::string>(),false, decoder_t::booleanDecoder, nullptr, false) }, }; |