X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-message-definition.cpp;h=a9ee20c5043ed5ad6c00acfd01ceca5365953417;hb=5412b6a4cd9e08b742035dddace225c9bbf5a203;hp=982942897c3daaaee0960c2f0eda95881d1ed3b4;hpb=d170c9faeae2cf29c19f3523714ecdf58be73bed;p=apps%2Flow-level-can-service.git

diff --git a/CAN-binder/low-can-binding/can/can-message-definition.cpp b/CAN-binder/low-can-binding/can/can-message-definition.cpp
index 9829428..a9ee20c 100644
--- a/CAN-binder/low-can-binding/can/can-message-definition.cpp
+++ b/CAN-binder/low-can-binding/can/can-message-definition.cpp
@@ -17,16 +17,16 @@
 
 #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}
+can_message_definition_t::can_message_definition_t(const std::string bus)
+	: parent_{nullptr}, bus_{bus}, last_value_{CAN_MESSAGE_SIZE}
 {}
 
-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,
 	frequency_clock_t frequency_clock,
 	bool force_send_changed)
-	: message_set_id_{message_set_id},
+	: parent_{nullptr},
 	  bus_{bus},
 	  id_{id},
 	  frequency_clock_{frequency_clock},
@@ -34,13 +34,13 @@ can_message_definition_t::can_message_definition_t(std::uint8_t message_set_id,
 	  last_value_{CAN_MESSAGE_SIZE}
 {}
 
-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,
 	can_message_format_t format,
 	frequency_clock_t frequency_clock,
 	bool force_send_changed)
-	: message_set_id_{message_set_id},
+	: parent_{nullptr},
 	bus_{bus},
 	id_{id},
 	format_{format},
@@ -49,7 +49,24 @@ can_message_definition_t::can_message_definition_t(std::uint8_t message_set_id,
 	last_value_{CAN_MESSAGE_SIZE}
 {}
 
-const std::string& can_message_definition_t::get_bus_name() const
+can_message_definition_t::can_message_definition_t(
+	const std::string bus,
+	uint32_t id,
+	can_message_format_t format,
+	frequency_clock_t frequency_clock,
+	bool force_send_changed,
+	const std::vector<std::shared_ptr<can_signal_t> >& can_signals)
+	:  parent_{nullptr},
+	bus_{bus},
+	id_{id},
+	format_{format},
+	frequency_clock_{frequency_clock},
+	force_send_changed_{force_send_changed},
+	last_value_{CAN_MESSAGE_SIZE},
+	can_signals_{std::move(can_signals)}
+{}
+
+const std::string can_message_definition_t::get_bus_name() const
 {
 	return bus_;
 }
@@ -57,4 +74,19 @@ const std::string& can_message_definition_t::get_bus_name() const
 uint32_t can_message_definition_t::get_id() const
 {
 	return id_;
+}
+
+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 can_message_t& cm)
+{
+	last_value_= cm.get_data_vector();
 }
\ No newline at end of file