Using new CMake architecture (again...)

[apps/low-level-can-service.git] / CAN-binder / low-can-binding / configuration.hpp

diff --git a/CAN-binder/low-can-binding/configuration.hpp b/CAN-binder/low-can-binding/configuration.hpp
index 017b148..a3ab8ca 100644 (file)
--- a/CAN-binder/low-can-binding/configuration.hpp
+++ b/CAN-binder/low-can-binding/configuration.hpp
@@ -43,17 +43,14 @@
 class configuration_t
 {
        private:
-               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.
+               can_bus_t can_bus_manager_; ///< instanciate the CAN bus manager. It's the one in charge of initialize the CAN bus devices.
                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_message_definition_t>> can_message_definition_;
-               std::vector<std::vector<can_signal_t>> can_signals_;
-               std::vector<std::vector<diagnostic_message_t>> diagnostic_messages_;
+               std::vector<can_message_set_t> can_message_set_; ///< Vector holding all message set from JSON signals description file
+               std::vector<std::vector<can_message_definition_t>> can_message_definition_; ///< Vector of vector holding all can message definition from JSON signals description file. This describe a CAN message. First vector map to message set
+               std::vector<std::vector<can_signal_t>> can_signals_; ///< Vector of vector holding all can signasl from JSON signals description file. A CAN signal is a part of a CAN message.  First vector map to message set
+               std::vector<std::vector<diagnostic_message_t>> diagnostic_messages_; ///< Vector of vector holding all diagnostics messages from JSON signals description file. First vector map to message set
 
                configuration_t(); ///< Private constructor with implementation generated by the AGL generator.
 
@@ -87,13 +84,8 @@ class configuration_t
 
                void set_active_message_set(uint8_t id);
 
-               void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<diagnostic_message_t*>& found_signals);
                diagnostic_message_t* get_diagnostic_message(std::string message_name) const;
-               DiagnosticRequest* get_request_from_diagnostic_message(diagnostic_message_t* diag_msg) const;
                DiagnosticRequest* get_request_from_diagnostic_message(std::string message_name) const;
-
-               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