Cleaning

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

diff --git a/CAN-binder/low-can-binding/can/can-signals.cpp b/CAN-binder/low-can-binding/can/can-signals.cpp
index 6211fa1..260d577 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-signals.cpp
+++ b/CAN-binder/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,
@@ -43,9 +45,8 @@ can_signal_t::can_signal_t(std::uint8_t message_set_id,
        SignalDecoder decoder,
        SignalEncoder 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,7 +79,7 @@ const std::string can_signal_t::get_name() const
        return prefix_ + "." + generic_name_;
 }
 
-const std::string& can_signal_t::get_prefix() const
+const std::string can_signal_t::get_prefix() const
 {
        return prefix_;
 }
@@ -170,6 +170,11 @@ float can_signal_t::get_last_value() const
        return last_value_;
 }
 
+void can_signal_t::set_parent(can_message_definition_t* parent)
+{
+       parent_ = parent;
+}
+
 void can_signal_t::set_prefix(std::string val)
 {
        prefix_ = val;
@@ -184,3 +189,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);
+}
+