X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.hpp;h=57eeef3de7d13eafb7b960c2f99e3551afc97ca9;hb=d464872942898b7412b389aabe0ebc390f17adc5;hp=321b96ea62402091b7c54594d05b2d0c564f1615;hpb=301b33d9bfff4db47a06684ebd7916cdebd63edc;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 321b96ea..57eeef3d 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -17,50 +17,55 @@
 
 #pragma once
 
+#include <map>
 #include <vector>
+#include <string>
 #include <fcntl.h>
 
 #include "can/can-bus.hpp"
 #include "can/can-signals.hpp"
 #include "can/can-message.hpp"
-#include "obd2/diagnostic-manager.hpp"
+#include "diagnostic/diagnostic-manager.hpp"
 
 #include "low-can-binding.hpp"
 
-/**
- * @brief Class representing a configuration attached to the binding.
- *
- * @desc It regroups all needed objects instance from other class
- *  that will be used along the binding life. It gets a global vision 
- *  on which signals are implemented for that binding. 
- *  Here, it is only the definition of the class with predefined accessors
- *  methods used in the binding.
- *
- *  It will be the reference point to needed objects.
- */
+///
+/// @brief Class representing a configuration attached to the binding.
+///
+/// It regroups all needed objects instance from other class
+///  that will be used along the binding life. It gets a global vision 
+///  on which signals are implemented for that binding. 
+///  Here, it is only the definition of the class with predefined accessors
+///  methods used in the binding.
+///
+///  It will be the reference point to needed objects.
+///
 class configuration_t
 {
 	private:
-		can_bus_t can_bus_manager_ = can_bus_t(afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_buses.json", O_RDONLY, NULL));
-		diagnostic_manager_t diagnostic_manager_;
-		uint8_t active_message_set_ = 0;
-		std::vector<std::string> signals_prefix_;
+		can_bus_t can_bus_manager_ = can_bus_t(
+			afb_daemon_rootdir_open_locale(
+				binder_interface->daemon, "etc/can_buses.json", O_RDONLY, NULL)); ///< instanciate the CAN bus
+				///< This will read the configuration file and initialize all CAN devices specified in it.
+		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_;
-		std::vector<std::vector<can_signal_t>> can_signals_;
-		std::vector<std::vector<obd2_signal_t>> obd2_signals_;
 		std::vector<std::vector<can_message_definition_t>> can_message_definition_;
+		std::vector<std::vector<can_signal_t>> can_signals_;
+		std::vector<std::vector<diagnostic_message_t>> diagnostic_messages_;
 
-		/// Private constructor with implementation generated by the AGL generator.
-		configuration_t();
+		configuration_t(); ///< Private constructor with implementation generated by the AGL generator.
 
 	public:
 		static configuration_t& instance();
 
-		configuration_t& get_configuration() ;
-
 		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;
@@ -69,19 +74,20 @@ class configuration_t
 
 		std::vector<can_signal_t>& get_can_signals();
 
-		std::vector<obd2_signal_t>& get_obd2_signals();
+		std::vector<diagnostic_message_t>& get_diagnostic_messages();
 
 		const std::vector<std::string>& get_signals_prefix() const;
 
 		const std::vector<can_message_definition_t>& get_can_message_definition();
+		const can_message_definition_t& get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id);
 
-		uint32_t get_signal_id(obd2_signal_t& sig) const;
+		uint32_t get_signal_id(diagnostic_message_t& sig) const;
 
 		uint32_t get_signal_id(can_signal_t& sig) const;
 
 		void set_active_message_set(uint8_t id);
 
-		void find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_t*>& found_signals);
+		void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<diagnostic_message_t*>& found_signals);
 
 		void find_can_signals(const openxc_DynamicField &key, std::vector<can_signal_t*>& found_signals);
 
@@ -108,3 +114,4 @@ class configuration_t
 		bool isBusActive(can_bus_dev_t* bus);
 		*/
 };
+