Use of signals prefix to be able to distinguish type of

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

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 5a76944..516b0ff 100644 (file)
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -44,37 +44,46 @@ class configuration_t
                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_;
 
-       public:
+               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_;
+
+               /// 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() const;
+               can_bus_t& get_can_bus_manager();
 
-               diagnostic_manager_t& get_diagnostic_manager() 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;
+               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 std::vector<std::string>& get_signals_prefix() 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