X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.hpp;h=be188b929deeff9082749842d9a2e9d289196799;hb=e6a4a15644b3e18232a48764aed32a9e13ec6a1f;hp=516b0ff878e657a6766ef8b5b72bd8551feaee65;hpb=6c40a7192cd6ddf89e625b53dd489b7a91a423e1;p=apps%2Flow-level-can-service.git

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 516b0ff..be188b9 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -17,13 +17,15 @@
 
 #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"
 
@@ -41,26 +43,29 @@
 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,18 +74,20 @@ class configuration_t
 
 		std::vector<can_signal_t>& get_can_signals();
 
-		const std::vector<can_message_definition_t>& get_can_message_definition();
-
-		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;
-		uint32_t get_signal_id(obd2_signal_t& sig) 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(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);
 
@@ -90,14 +97,12 @@ class configuration_t
 		/// @param[in] bus A CanBus struct defining the bus's metadata
 		/// @param[in] writable Configure the controller in a writable mode. If false, it will be configured as "listen only" and will not allow writes or even CAN ACKs.
 		/// @param[in] buses An array of all CAN buses.
-		/// @param[in] busCount The length of the buses array.
 		void pre_initialize(can_bus_dev_t* bus, bool writable, can_bus_dev_t* buses, const int busCount);
 		/// TODO: implement this function as method into can_bus class
 		/// @brief Post-initialize actions made after CAN bus initialization
 		/// @param[in] bus A CanBus struct defining the bus's metadata
 		/// @param[in] writable Configure the controller in a writable mode. If false, it will be configured as "listen only" and will not allow writes or even CAN ACKs.
 		/// @param[in] buses An array of all CAN buses.
-		/// @param[in] busCount The length of the buses array.
 		void post_initialize(can_bus_dev_t* bus, bool writable, can_bus_dev_t* buses, const int busCount);
 		/// TODO: implement this function as method into can_bus class
 		/// @brief Check if the device is connected to an active CAN bus, i.e. it's received a message in the recent past.
@@ -106,7 +111,7 @@ class configuration_t
 		/// TODO: implement this function as method into can_bus class
 		/// @brief Log transfer statistics about all active CAN buses to the debug log.
 		/// @param[in] buses An array of active CAN buses.
-		/// @param[in] busCount The length of the buses array.
 		bool isBusActive(can_bus_dev_t* bus);
 		*/
 };
+