X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.hpp;h=9c49da0441267d8acb62bbcf4ef722743d0b5bdd;hb=8a0bbcda01776fb44057f53235fb2821e4863cf7;hp=92655a6cd9f47fd5dc6209bb861fa8542daabe40;hpb=c631ee0bf8f702004c9d21c501d9588458c0ca08;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 92655a6c..9c49da04 100644
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -46,66 +46,40 @@ class configuration_t
 		uint8_t active_message_set_ = 0;
 
 	public:
+		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_;
 
-		configuration_t& get_configuration()
-		{ 
-			return *this;
-		}
-
-		can_bus_t& get_can_bus_manager()
-		{
-			return can_bus_manager_;
-		}
-
-		diagnostic_manager_t& get_diagnostic_manager()
-		{
-			return diagnostic_manager_;
-		}
-
-		uint8_t get_active_message_set()
-		{
-			return active_message_set_;
-		}
-
-		const std::vector<can_message_set_t>& get_can_message_set()
-		{
-			return can_message_set_;
-		}
-
-		const std::vector<can_signal_t>& get_can_signals()
-		{
-			return can_signals_[active_message_set_];
-		}
-
-		const std::vector<can_message_definition_t>& get_can_message_definition()
-		{
-			return can_message_definition_[active_message_set_];
-		}
-
-		const std::vector<obd2_signal_t>& get_obd2_signals()
-		{
-			return obd2_signals_;
-		}
-
-		uint32_t get_signal_id(obd2_signal_t& sig)
-		{
-			return sig.get_pid();
-		}
-
-		uint32_t get_signal_id(can_signal_t& sig)
-		{
-			return sig.get_message()->id;
-		}
-
-		void set_active_message_set(uint8_t id)
-		{
-			active_message_set_ = id;
-		}
+		configuration_t& get_configuration() const;
+
+		can_bus_t& get_can_bus_manager();
+
+		diagnostic_manager_t& get_diagnostic_manager() const;
+
+		uint8_t get_active_message_set() const;
+
+		const std::vector<can_message_set_t>& get_can_message_set() const;
+
+		std::vector<can_signal_t>& get_can_signals() const;
+
+		const std::vector<can_message_definition_t>& get_can_message_definition() const;
+
+		std::vector<obd2_signal_t>& get_obd2_signals() const;
+
+		uint32_t get_signal_id(obd2_signal_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_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
@@ -129,5 +103,9 @@ class configuration_t
 		/// @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;
+