X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.hpp;h=224672ec951c8dd479833a56ce8bff9fdf232674;hb=1d464d2a7380248b04c3e734ed5c6e84bbf53ddf;hp=77f452ff9cf5cfa398ff3742b5f709661dbc18ba;hpb=1ed2a620b5ac6272de01be7f1830715f7f0d280d;p=apps%2Flow-level-can-service.git

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 77f452f..224672e 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -41,33 +41,43 @@
 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));
+		can_bus_t can_bus_manager_ = can_bus_t(afb_daemon_rootdir_open_locale(binder_interface->daemon, "etc/can_buses.json", O_RDONLY, NULL));
 		diagnostic_manager_t diagnostic_manager_;
 		uint8_t active_message_set_ = 0;
+		std::vector<std::string> signals_prefix_;
 
-	public:
+		std::vector<can_message_set_t> can_message_set_;
+		std::vector<std::vector<can_message_definition_t>> can_message_definition_;
+		std::vector<std::vector<can_signal_t>> can_signals_;
+		std::vector<std::vector<obd2_signal_t>> obd2_signals_;
+
+		/// Private constructor with implementation generated by the AGL generator.
 		configuration_t();
 
-		const std::vector<obd2_signal_t> obd2_signals_;
-		const std::vector<can_message_set_t> can_message_set_;
-		const std::vector<std::vector<can_signal_t>> can_signals_;
-		const std::vector<std::vector<can_message_definition_t>> can_message_definition_;
+	public:
+		static configuration_t& instance();
 
-		configuration_t& get_configuration() const;
+		configuration_t& get_configuration() ;
 
 		can_bus_t& get_can_bus_manager();
 
-		diagnostic_manager_t& get_diagnostic_manager() const;
+		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() const;
+		const std::vector<can_message_set_t>& get_can_message_set();
 
-		const std::vector<can_signal_t>& get_can_signals() const;
+		std::vector<can_signal_t>& get_can_signals();
 
-		const std::vector<can_message_definition_t>& get_can_message_definition() const;
+		std::vector<obd2_signal_t>& get_obd2_signals();
 
-		const std::vector<obd2_signal_t>& get_obd2_signals() const;
+		const std::vector<std::string>& get_signals_prefix() const;
+
+		const std::vector<can_message_definition_t>& get_can_message_definition();
 
 		uint32_t get_signal_id(obd2_signal_t& sig) const;
 
@@ -75,20 +85,22 @@ class configuration_t
 
 		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_can_signals(const openxc_DynamicField &key, std::vector<can_signal_t*>& found_signals);
+
 /*
 		/// TODO: implement this function as method into can_bus class
 		/// @brief Pre initialize actions made before 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 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.
@@ -97,11 +109,9 @@ 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);
 		*/
 };
 
-// Make a global variable pointer
-extern configuration_t *config;
-
+// TEMP Function to access OBD2_PIDS vector
+std::vector<obd2_signal_t> get_predefined_obd2();