Filter tests improvements

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

diff --git a/low-can-binding/can/can-signals.cpp b/low-can-binding/can/can-signals.cpp
index 6211fa1..240436f 100644 (file)
--- a/low-can-binding/can/can-signals.cpp
+++ b/low-can-binding/can/can-signals.cpp
@@ -19,15 +19,17 @@
 
 #include "can-signals.hpp"
 
-#include "../configuration.hpp"
+#include "../binding/application.hpp"
 #include "../utils/signals.hpp"
 #include "can-decoder.hpp"
+#include "can-message.hpp"
+#include "can-bus.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
+#include "canutil/write.h"
 
 std::string can_signal_t::prefix_ = "messages";
 
-can_signal_t::can_signal_t(std::uint8_t message_set_id,
-       std::uint8_t message_id,
+can_signal_t::can_signal_t(
        std::string generic_name,
        uint8_t bit_position,
        uint8_t bit_size,
@@ -40,12 +42,11 @@ can_signal_t::can_signal_t(std::uint8_t message_set_id,
        bool force_send_changed,
        std::map<uint8_t, std::string> states,
        bool writable,
-       SignalDecoder decoder,
-       SignalEncoder encoder,
+       signal_decoder decoder,
+       signal_encoder encoder,
        bool received)
-       : message_set_id_{ message_set_id }
-       , message_id_{ message_id }
-       , generic_name_{ generic_name }
+       : parent_{nullptr},
+        generic_name_{ generic_name }
        , bit_position_{ bit_position }
        , bit_size_{ bit_size }
        , factor_{ factor }
@@ -63,13 +64,12 @@ can_signal_t::can_signal_t(std::uint8_t message_set_id,
        , last_value_{.0f}
 {}
 
-
-const can_message_definition_t& can_signal_t::get_message() const
+can_message_definition_t* can_signal_t::get_message() const
 {
-       return configuration_t::instance().get_can_message_definition(message_set_id_, message_id_);
+       return parent_;
 }
 
-const std::string& can_signal_t::get_generic_name() const
+const std::string can_signal_t::get_generic_name() const
 {
        return generic_name_;
 }
@@ -79,11 +79,6 @@ const std::string can_signal_t::get_name() const
        return prefix_ + "." + generic_name_;
 }
 
-const std::string& can_signal_t::get_prefix() const
-{
-       return prefix_;
-}
-
 uint8_t can_signal_t::get_bit_position() const
 {
        return bit_position_;
@@ -104,16 +99,6 @@ float can_signal_t::get_offset() const
        return offset_;
 }
 
-float can_signal_t::get_min_value() const
-{
-       return min_value_;
-}      
-
-float can_signal_t::get_max_value() const
-{
-       return max_value_;
-}
-
 frequency_clock_t& can_signal_t::get_frequency()
 {
        return frequency_;
@@ -124,16 +109,6 @@ bool can_signal_t::get_send_same() const
        return send_same_;
 }
 
-bool can_signal_t::get_force_send_changed() const
-{
-       return force_send_changed_;
-}
-
-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())
@@ -141,9 +116,18 @@ const std::string can_signal_t::get_states(uint8_t value)
        return std::string();
 }
 
-size_t can_signal_t::get_state_count() const
+uint64_t can_signal_t::get_states(const std::string& value) const
 {
-       return states_.size();
+       uint64_t ret = -1;
+       for( const auto& state: states_)
+       {
+               if(state.second == value)
+               {
+                       ret = (uint64_t)state.first;
+                       break;
+               }
+       }
+       return ret;
 }
 
 bool can_signal_t::get_writable() const
@@ -151,12 +135,12 @@ bool can_signal_t::get_writable() const
        return writable_;
 }
 
-SignalDecoder& can_signal_t::get_decoder()
+signal_decoder& can_signal_t::get_decoder()
 {
        return decoder_;
 }
 
-SignalEncoder& can_signal_t::get_encoder()
+signal_encoder& can_signal_t::get_encoder()
 {
        return encoder_;
 }
@@ -165,14 +149,20 @@ bool can_signal_t::get_received() const
 {
        return received_;
 }
+
 float can_signal_t::get_last_value() const
 {
        return last_value_;
 }
 
-void can_signal_t::set_prefix(std::string val)
+std::pair<float, uint64_t> can_signal_t::get_last_value_with_timestamp() const
 {
-       prefix_ = val;
+       return std::make_pair(last_value_, frequency_.get_last_tick());
+}
+
+void can_signal_t::set_parent(can_message_definition_t* parent)
+{
+       parent_ = parent;
 }
 
 void can_signal_t::set_received(bool r)
@@ -184,3 +174,9 @@ void can_signal_t::set_last_value(float val)
 {
        last_value_ = val;
 }
+
+void can_signal_t::set_timestamp(uint64_t timestamp)
+{
+       frequency_.tick(timestamp);
+}
+