Change binder to binding in title in use with gitbook

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

diff --git a/src/can/can-signals.cpp b/src/can/can-signals.cpp
index ce4e264..6211fa1 100644 (file)
--- a/src/can/can-signals.cpp
+++ b/src/can/can-signals.cpp
@@ -22,14 +22,51 @@
 #include "../configuration.hpp"
 #include "../utils/signals.hpp"
 #include "can-decoder.hpp"
-#include "../obd2/obd2-signals.hpp"
-#include "../low-can-binding.hpp"
+#include "../diagnostic/diagnostic-message.hpp"
 
 std::string can_signal_t::prefix_ = "messages";
 
-can_message_definition_t& can_signal_t::get_message()
-{
-       return message_;
+can_signal_t::can_signal_t(std::uint8_t message_set_id,
+       std::uint8_t message_id,
+       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<uint8_t, std::string> states,
+       bool writable,
+       SignalDecoder decoder,
+       SignalEncoder encoder,
+       bool received)
+       : message_set_id_{ message_set_id }
+       , message_id_{ message_id }
+       , 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_{.0f}
+{}
+
+
+const can_message_definition_t& can_signal_t::get_message() const
+{
+       return configuration_t::instance().get_can_message_definition(message_set_id_, message_id_);
 }
 
 const std::string& can_signal_t::get_generic_name() const
@@ -92,11 +129,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::map<uint8_t, std::string>& can_signal_t::get_states() const
 {
        return states_;
 }
 
+const std::string can_signal_t::get_states(uint8_t value)
+{
+       if (value < states_.size())
+               return states_[value];
+       return std::string();
+}
+
 size_t can_signal_t::get_state_count() const
 {
        return states_.size();