4 files changed, 26 insertions, 23 deletions
diff --git a/src/can/can-decoder.cpp b/src/can/can-decoder.cpp
index 49fd151..5f5bce8 100644
--- a/src/can/can-decoder.cpp
+++ b/src/can/can-decoder.cpp
@@ -63,18 +63,13 @@ 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)
 {
-	openxc_DynamicField decoded_value = {0, openxc_DynamicField_Type_BOOL, 0, "", 0, 0, 0, 0};
-	decoded_value.has_type = true;
-	decoded_value.type = openxc_DynamicField_Type_STRING;
-	decoded_value.has_string_value = true;
-
-	/* TODO: Handle SignalState 
-	const can_signal_tState* signalState = lookupSignalState(value, signal);
-	if(signalState != NULL) {
-		::strcpy(decoded_value.string_value, signalState->name);
-	} else {
+	const std::string signal_state = signal.get_states(value);
+	openxc_DynamicField decoded_value = build_DynamicField(signal_state);
+	if(signal_state.size() <= 0)
+	{
 		*send = false;
-	}*/
+		ERROR(binder_interface, "stateDecoder: No state found with index: %d", (int)value);
+	}
 	return decoded_value;
 }
 
diff --git a/src/can/can-message.cpp b/src/can/can-message.cpp
index cd4a81e..36cce92 100644
--- a/src/can/can-message.cpp
+++ b/src/can/can-message.cpp
@@ -30,8 +30,8 @@ can_message_t::can_message_t()
 	: maxdlen_{0}, id_{0}, length_{0}, format_{can_message_format_t::ERROR}, rtr_flag_{false}, flags_{0}
 {}
 
-can_message_t::can_message_t(uint8_t maxdlen, uint32_t id, uint8_t length, can_message_format_t format, bool rtr_flag_, uint8_t flags, std::vector<uint8_t> data)
-	:  maxdlen_{0}, id_{0}, length_{0}, format_{can_message_format_t::ERROR}, rtr_flag_{false}, flags_{0}, data_{data}
+can_message_t::can_message_t(uint8_t maxdlen, uint32_t id, uint8_t length, can_message_format_t format, bool rtr_flag, uint8_t flags, std::vector<uint8_t> data)
+	:  maxdlen_{maxdlen}, id_{id}, length_{length}, format_{format}, rtr_flag_{rtr_flag}, flags_{flags}, data_{data}
 {}
 
 /**
diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index b7b311b..d04c03a 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();
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();