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 48c919d..260d577 100644 (file)
--- a/CAN-binder/low-can-binding/can/can-signals.cpp
+++ b/CAN-binder/low-can-binding/can/can-signals.cpp
@@ -19,7 +19,7 @@
 
 #include "can-signals.hpp"
 
-#include "../binding/configuration.hpp"
+#include "../binding/application.hpp"
 #include "../utils/signals.hpp"
 #include "can-decoder.hpp"
 #include "can-message.hpp"
@@ -29,8 +29,7 @@
 
 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,
@@ -46,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 }
@@ -66,17 +64,12 @@ can_signal_t::can_signal_t(std::uint8_t message_set_id,
        , last_value_{.0f}
 {}
 
-utils::socketcan_bcm_t can_signal_t::get_socket() const
+can_message_definition_t* can_signal_t::get_message() const
 {
-       return socket_;
+       return parent_;
 }
 
-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
+const std::string can_signal_t::get_generic_name() const
 {
        return generic_name_;
 }
@@ -86,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_;
 }
@@ -177,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;
@@ -192,46 +190,8 @@ void can_signal_t::set_last_value(float val)
        last_value_ = val;
 }
 
-/// @brief Create a RX_SETUP receive job using the BCM socket.
-///
-/// @return 0 if ok else -1
-int can_signal_t::create_rx_filter()
-{
-       // Make sure that socket has been opened.
-       if(! socket_)
-               socket_.open(
-                       get_message().get_bus_name());
-
-       uint32_t can_id  = get_message().get_id();
-
-       struct utils::simple_bcm_msg bcm_msg;
-       struct can_frame cfd;
-
-       memset(&cfd, 0, sizeof(cfd));
-       memset(&bcm_msg.msg_head, 0, sizeof(bcm_msg.msg_head));
-       float val = (float)(1 << bit_size_)-1;
-       float freq = frequency_.frequency_to_period();
-       if(freq <= 0)
-               freq = 0.000001f;
-
-       bcm_msg.msg_head.opcode  = RX_SETUP;
-       bcm_msg.msg_head.can_id  = can_id;
-       bcm_msg.msg_head.flags = SETTIMER;
-       bcm_msg.msg_head.ival2.tv_sec = long(freq);
-       bcm_msg.msg_head.ival2.tv_usec = (freq - (long)freq) * 1000000;
-       bcm_msg.msg_head.nframes = 1;
-       bitfield_encode_float(val,
-                                                                               bit_position_,
-                                                                               bit_size_,
-                                                                               factor_,
-                                                                               offset_,
-                                                                               cfd.data,
-                                                                               CAN_MAX_DLEN);
-
-       bcm_msg.frames = cfd;
-
-       if(socket_ << bcm_msg)
-               return 0;
-       return -1;
+void can_signal_t::set_timestamp(uint64_t timestamp)
+{
+       frequency_.tick(timestamp);
 }