X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fbinding%2Fconfiguration.hpp;h=fc53d38655f748583706503906f15fbe7728a570;hb=7747851ca010a3dfe9ffee808376dd5a7af68b91;hp=4488164548321871b57c1ed25c993c350e526bf9;hpb=d253ada94487232ccd33b68a69fd44ff7840fab7;p=apps%2Flow-level-can-service.git

diff --git a/CAN-binder/low-can-binding/binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp
index 4488164..fc53d38 100644
--- a/CAN-binder/low-can-binding/binding/configuration.hpp
+++ b/CAN-binder/low-can-binding/binding/configuration.hpp
@@ -47,10 +47,10 @@ class configuration_t
 		diagnostic_manager_t diagnostic_manager_; ///< Diagnostic manager use to manage diagnostic message communication.
 		uint8_t active_message_set_ = 0; ///< Which is the active message set ? Default to 0.
 
-		std::vector<can_message_set_t> can_message_set_; ///< Vector holding all message set from JSON signals description file
+		std::vector<std::shared_ptr<can_message_set_t> > can_message_set_; ///< Vector holding all message set from JSON signals description file
 		//std::vector<std::vector<can_message_definition_t>> can_message_definition_; ///< Vector of vector holding all can message definition from JSON signals description file. This describe a CAN message. First vector map to message set
 		//std::vector<std::vector<can_signal_t>> can_signals_; ///< Vector of vector holding all can signasl from JSON signals description file. A CAN signal is a part of a CAN message.  First vector map to message set
-		std::vector<std::vector<diagnostic_message_t>> diagnostic_messages_; ///< Vector of vector holding all diagnostics messages from JSON signals description file. First vector map to message set
+		//std::vector<std::vector<std::shared_ptr<diagnostic_message_t> > > diagnostic_messages_; ///< Vector of vector holding all diagnostics messages from JSON signals description file. First vector map to message set
 
 		configuration_t(); ///< Private constructor with implementation generated by the AGL generator.
 
@@ -59,23 +59,21 @@ class configuration_t
 
 		can_bus_t& get_can_bus_manager();
 
-		const std::map<std::string, std::shared_ptr<can_bus_dev_t>>& get_can_bus_devices();
-
 		const std::string get_diagnostic_bus() const;
 
 		diagnostic_manager_t& get_diagnostic_manager() ;
 
 		uint8_t get_active_message_set() const;
 
-		const std::vector<can_message_set_t>& get_can_message_set();
+		std::vector<std::shared_ptr<can_message_set_t> > get_can_message_set();
 
-		std::vector<std::shared_ptr<can_signal_t> > get_can_signals();
+		std::vector<std::shared_ptr<can_signal_t> > get_all_can_signals();
 
-		std::vector<diagnostic_message_t>& get_diagnostic_messages();
+		std::vector<std::shared_ptr<diagnostic_message_t> >& get_diagnostic_messages();
 
 		const std::vector<std::string>& get_signals_prefix() const;
 
-		std::vector<std::shared_ptr<can_message_definition_t> > get_can_message_definition();
+		std::vector<std::shared_ptr<can_message_definition_t> >& get_can_message_definition();
 
 		uint32_t get_signal_id(diagnostic_message_t& sig) const;
 
@@ -83,8 +81,8 @@ class configuration_t
 
 		void set_active_message_set(uint8_t id);
 
-		diagnostic_message_t* get_diagnostic_message(std::string message_name) const;
-		DiagnosticRequest* get_request_from_diagnostic_message(std::string message_name) const;
+		std::shared_ptr<diagnostic_message_t> get_diagnostic_message(const std::string& message_name) const;
+		DiagnosticRequest* get_request_from_diagnostic_message(const std::string& message_name) const;
 /*
 		/// TODO: implement this function as method into can_bus class
 		/// @brief Pre initialize actions made before CAN bus initialization