X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.hpp;h=017b148d267ea17f17259dd2eb7985ae55b6c6fd;hb=46d396e04947a76756739576a29c8369f8cd0c50;hp=981e69e413eafcf75ffeefc3f01c36ae811cc8f8;hpb=72305e67ee45ba6b56bca48b17303bf0322a8209;p=apps%2Fagl-service-can-low-level.git diff --git a/src/configuration.hpp b/src/configuration.hpp index 981e69e4..017b148d 100644 --- a/src/configuration.hpp +++ b/src/configuration.hpp @@ -17,46 +17,55 @@ #pragma once +#include #include +#include #include #include "can/can-bus.hpp" #include "can/can-signals.hpp" #include "can/can-message.hpp" -#include "obd2/diagnostic-manager.hpp" +#include "diagnostic/diagnostic-manager.hpp" #include "low-can-binding.hpp" -/** - * @brief Class representing a configuration attached to the binding. - * - * @desc It regroups all needed objects instance from other class - * that will be used along the binding life. It gets a global vision - * on which signals are implemented for that binding. - * Here, it is only the definition of the class with predefined accessors - * methods used in the binding. - * - * It will be the reference point to needed objects. - */ +/// +/// @brief Class representing a configuration attached to the binding. +/// +/// It regroups all needed objects instance from other class +/// that will be used along the binding life. It gets a global vision +/// on which signals are implemented for that binding. +/// Here, it is only the definition of the class with predefined accessors +/// methods used in the binding. +/// +/// It will be the reference point to needed objects. +/// 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)); - diagnostic_manager_t diagnostic_manager_; - uint8_t active_message_set_ = 0; - - public: - configuration_t(); + 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. + 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_; - std::vector> can_signals_; - std::vector> obd2_signals_; std::vector> can_message_definition_; + std::vector> can_signals_; + std::vector> diagnostic_messages_; - configuration_t& get_configuration() ; + configuration_t(); ///< Private constructor with implementation generated by the AGL generator. + + public: + static configuration_t& instance(); can_bus_t& get_can_bus_manager(); + const std::map>& get_can_bus_devices(); + + const std::string get_diagnostic_bus() const; + diagnostic_manager_t& get_diagnostic_manager() ; uint8_t get_active_message_set() const; @@ -65,17 +74,23 @@ class configuration_t std::vector& get_can_signals(); - const std::vector& get_can_message_definition(); + std::vector& get_diagnostic_messages(); - std::vector& get_obd2_signals(); + const std::vector& get_signals_prefix() const; - uint32_t get_signal_id(obd2_signal_t& sig) const; + const std::vector& get_can_message_definition(); + const can_message_definition_t& get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id); + + uint32_t get_signal_id(diagnostic_message_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& found_signals); + void find_diagnostic_messages(const openxc_DynamicField &key, std::vector& 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& found_signals); @@ -85,14 +100,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. @@ -101,11 +114,7 @@ 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); */ }; -// Make a global variable pointer -extern configuration_t *config; -