Better use a reference

[apps/agl-service-can-low-level.git] / src / configuration.hpp

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 83b20e6..9c49da0 100644 (file)
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -46,6 +46,8 @@ 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_;
@@ -53,7 +55,7 @@ class configuration_t
 
                configuration_t& get_configuration() const;
 
-               can_bus_t& get_can_bus_manager() const;
+               can_bus_t& get_can_bus_manager();
 
                diagnostic_manager_t& get_diagnostic_manager() const;
 
@@ -61,11 +63,11 @@ class configuration_t
 
                const std::vector<can_message_set_t>& get_can_message_set() const;
 
-               const std::vector<can_signal_t>& get_can_signals() const;
+               std::vector<can_signal_t>& get_can_signals() const;
 
                const std::vector<can_message_definition_t>& get_can_message_definition() const;
 
-               const std::vector<obd2_signal_t>& get_obd2_signals() const;
+               std::vector<obd2_signal_t>& get_obd2_signals() const;
 
                uint32_t get_signal_id(obd2_signal_t& sig) const;
 
@@ -73,6 +75,10 @@ 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
@@ -99,3 +105,7 @@ class configuration_t
                bool isBusActive(can_bus_dev_t* bus);
                */
 };
+
+// Make a global variable pointer
+extern configuration_t *config;
+