Adding/Fix classes constructors to make them correspond

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

diff --git a/src/configuration.hpp b/src/configuration.hpp
index 516b0ff..214b3e7 100644 (file)
--- a/src/configuration.hpp
+++ b/src/configuration.hpp
@@ -41,15 +41,15 @@
 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_;
 
                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_;
-               std::vector<std::vector<can_message_definition_t>> can_message_definition_;
 
                /// Private constructor with implementation generated by the AGL generator.
                configuration_t();
@@ -61,6 +61,8 @@ class configuration_t
 
                can_bus_t& get_can_bus_manager();
 
+               const std::vector<std::shared_ptr<can_bus_dev_t>>& get_can_bus_devices();
+
                diagnostic_manager_t& get_diagnostic_manager() ;
 
                uint8_t get_active_message_set() const;
@@ -69,11 +71,12 @@ class configuration_t
 
                std::vector<can_signal_t>& get_can_signals();
 
-               const std::vector<can_message_definition_t>& get_can_message_definition();
-
                std::vector<obd2_signal_t>& get_obd2_signals();
 
                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;
 
                uint32_t get_signal_id(can_signal_t& sig) const;
@@ -90,14 +93,12 @@ class configuration_t
                /// @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.
@@ -106,7 +107,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);
                */
 };
+
+// TEMP Function to access OBD2_PIDS vector
+std::vector<obd2_signal_t> get_predefined_obd2();