diff options
Diffstat (limited to 'src/can/can-signals.hpp')
| -rw-r--r-- | src/can/can-signals.hpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/can/can-signals.hpp b/src/can/can-signals.hpp index 53acd00..c522d0a 100644 --- a/src/can/can-signals.hpp +++ b/src/can/can-signals.hpp @@ -95,24 +95,24 @@ private: * clock's frequency to 0. */ 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::map<int, std::string> states_; /*!< states_ - A map of CAN signal state describing the mapping - * between numerical and string values for valid states. */ + * value if it has changed. */ + std::vector<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.*/ + * back to CAN. Defaults to false.*/ SignalDecoder decoder_; /*!< decoder_ - An optional function to decode a signal from the bus to a human - * readable value. If NULL, the default numerical decoder is used. */ + * readable value. If NULL, the default numerical decoder is used. */ SignalEncoder encoder_; /*!< encoder_ - An optional function to encode a signal value to be written to * CAN into a byte array. If NULL, the default numerical encoder * is used. */ bool received_; /*!< received_ - True if this signal has ever been received.*/ float last_value_; /*!< lastValue_ - The last received value of the signal. If 'received' is false, - * this value is undefined. */ + * this value is undefined. */ 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::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); can_message_definition_t& get_message(); const std::string& get_generic_name() const; @@ -127,7 +127,8 @@ public: frequency_clock_t& get_frequency(); bool get_send_same() const; bool get_force_send_changed() const; - std::map<int, std::string> get_state() const; + const std::vector<std::string>& get_states() const; + const std::string get_states(float value) const; size_t get_state_count() const; bool get_writable() const; SignalDecoder& get_decoder(); |