New constructor j1939 message definition

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

diff --git a/low-can-binding/can/can-message-definition.cpp b/low-can-binding/can/can-message-definition.cpp
index 206d0b0..8f2930f 100644 (file)
--- a/low-can-binding/can/can-message-definition.cpp
+++ b/low-can-binding/can/can-message-definition.cpp
@@ -17,39 +17,88 @@
 
 #include "can-message-definition.hpp"
 
-can_message_definition_t::can_message_definition_t(std::uint8_t message_set_id, const std::string bus)
-       : message_set_id_{message_set_id}, bus_{bus}, last_value_{CAN_MESSAGE_SIZE}
-{}
+#include "../binding/application.hpp"
 
-can_message_definition_t::can_message_definition_t(std::uint8_t message_set_id,
+can_message_definition_t::can_message_definition_t(
        const std::string bus,
        uint32_t id,
+       bool is_fd,
+       can_message_format_t format,
        frequency_clock_t frequency_clock,
-       bool force_send_changed)
-       : message_set_id_{message_set_id},
-         bus_{bus},
-         id_{id},
-         frequency_clock_{frequency_clock},
-         force_send_changed_{force_send_changed},
-         last_value_{CAN_MESSAGE_SIZE}
+       bool force_send_changed,
+       const std::vector<std::shared_ptr<can_signal_t> >& can_signals)
+       :  parent_{nullptr},
+       bus_{bus},
+       id_{id},
+       is_fd_(is_fd),
+       format_{format},
+       frequency_clock_{frequency_clock},
+       force_send_changed_{force_send_changed},
+       last_value_{CAN_MESSAGE_SIZE},
+       can_signals_{can_signals}
 {}
 
-can_message_definition_t::can_message_definition_t(std::uint8_t message_set_id,
-       const std::string bus,
+can_message_definition_t::can_message_definition_t(const std::string bus,
        uint32_t id,
+       const std::string name,
+       uint32_t length,
+       bool is_fd,
        can_message_format_t format,
        frequency_clock_t frequency_clock,
-       bool force_send_changed)
-       : message_set_id_{message_set_id},
+       bool force_send_changed,
+       const std::vector<std::shared_ptr<can_signal_t> >& can_signals)
+       : parent_{nullptr},
        bus_{bus},
        id_{id},
+       name_{name},
+       length_{length},
+       is_fd_(is_fd),
        format_{format},
        frequency_clock_{frequency_clock},
        force_send_changed_{force_send_changed},
-       last_value_{CAN_MESSAGE_SIZE}
+       last_value_{CAN_MESSAGE_SIZE},
+       can_signals_{can_signals}
 {}
 
+const std::string can_message_definition_t::get_bus_device_name() const
+{
+       return application_t::instance().get_can_bus_manager()
+               .get_can_device_name(bus_);
+}
+
 uint32_t can_message_definition_t::get_id() const
 {
        return id_;
-}
\ No newline at end of file
+}
+
+bool can_message_definition_t::is_fd() const
+{
+       return is_fd_;
+}
+
+bool can_message_definition_t::is_j1939() const
+{
+       if(format_ == can_message_format_t::J1939)
+       {
+               return true;
+       }
+       else
+       {
+               return false;
+       }
+}
+
+std::vector<std::shared_ptr<can_signal_t> >& can_message_definition_t::get_can_signals()
+{
+       return can_signals_;
+}
+
+void can_message_definition_t::set_parent(can_message_set_t* parent)
+{
+       parent_= parent;
+}
+
+void can_message_definition_t::set_last_value(const message_t& cm)
+{
+       last_value_= cm.get_data_vector();
+}