Revert accessing CAN device with a map indexing on dev name

[apps/low-level-can-service.git] / src / can / can-signals.cpp

diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index 00b6ee0..d04c03a 100644 (file)
--- a/src/can/can-signals.cpp
+++ b/src/can/can-signals.cpp
@@ -25,6 +25,16 @@
 #include "../obd2/obd2-signals.hpp"
 #include "../low-can-binding.hpp"
 
+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)
+       : 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}
+{}
+
 can_message_definition_t& can_signal_t::get_message()
 {
        return message_;
@@ -90,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();