Typo

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

diff --git a/src/configuration.cpp b/src/configuration.cpp
index e6114cb..184d468 100644 (file)
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -19,30 +19,19 @@
 
 #include "utils/signals.hpp"
 
-// Dumb signals and message implementation. To get compile.
-/*std::vector<can_message_set_t> CAN_MESSAGE_SET;
-
-std::vector<std::vector<can_message_definition_t>> CAN_MESSAGES_DEFINITION;
-
-std::vector<std::vector<can_signal_t>> SIGNALS;*/
-
+/// @brief Return singleton instance of configuration object.
 configuration_t& configuration_t::instance()
 {
        static configuration_t config;
        return config;
 }
 
-configuration_t& configuration_t::get_configuration()
-{
-       return *this;
-}
-
 can_bus_t& configuration_t::get_can_bus_manager()
 {
        return can_bus_manager_;
 }
 
-const std::vector<std::shared_ptr<can_bus_dev_t>>& configuration_t::get_can_bus_devices()
+const std::map<std::string, std::shared_ptr<can_bus_dev_t>>& configuration_t::get_can_bus_devices()
 {
        return can_bus_manager_.get_can_devices();
 }
@@ -67,22 +56,22 @@ std::vector<can_signal_t>& configuration_t::get_can_signals()
        return can_signals_[active_message_set_];
 }
 
-std::vector<obd2_signal_t>& configuration_t::get_obd2_signals()
+std::vector<diagnostic_message_t>& configuration_t::get_diagnostic_messages()
 {
-       return obd2_signals_[active_message_set_];
+       return diagnostic_messages_[active_message_set_];
 }
 
-const std::vector<std::string>& configuration_t::get_signals_prefix() const
+const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition()
 {
-       return signals_prefix_;
+       return can_message_definition_[active_message_set_];
 }
 
-const std::vector<can_message_definition_t>& configuration_t::get_can_message_definition()
+const can_message_definition_t& configuration_t::get_can_message_definition(std::uint8_t message_set_id, std::uint8_t message_id)
 {
-       return can_message_definition_[active_message_set_];
+       return can_message_definition_[message_set_id][message_id];
 }
 
-uint32_t configuration_t::get_signal_id(obd2_signal_t& sig) const
+uint32_t configuration_t::get_signal_id(diagnostic_message_t& sig) const
 {
        return sig.get_pid();
 }
@@ -97,41 +86,35 @@ void configuration_t::set_active_message_set(uint8_t id)
        active_message_set_ = id;
 }
 
-/**
- * @fn std::vector<std::string> find_can_signals(const openxc_DynamicField &key)
- * @brief return signals name found searching through CAN_signals and OBD2 pid
- *
- * @param[in] key - can contain numeric or string value in order to search against
- *   can signals or obd2 signals name.
- *
- * @return Vector of signals name found.
- */
-void configuration_t::find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_t*>& found_signals)
+/// @brief return diagnostic messages name found searching through diagnostic messages list.
+///
+/// @param[in] key - can contain numeric or string value in order to search against
+///   can signals or obd2 signals name.
+/// @param[out] found_signals - Vector of signals name found.
+///
+void configuration_t::find_diagnostic_messages(const openxc_DynamicField &key, std::vector<diagnostic_message_t*>& found_signals)
 {
        switch(key.type)
        {
                case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING:
-                               lookup_signals_by_name(key.string_value, obd2_signals_[active_message_set_], found_signals);
+                               lookup_signals_by_name(key.string_value, diagnostic_messages_[active_message_set_], found_signals);
                        break;
                case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM:
-                               lookup_signals_by_id(key.numeric_value, obd2_signals_[active_message_set_], found_signals);
+                               lookup_signals_by_id(key.numeric_value, diagnostic_messages_[active_message_set_], found_signals);
                        break;
                default:
-                       ERROR(binder_interface, "find_obd2_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
+                       ERROR(binder_interface, "find_diagnostic_messages: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only.");
                        break;
        }
-       DEBUG(binder_interface, "find_obd2_signals: Found %d signal(s)", (int)found_signals.size());
+       DEBUG(binder_interface, "find_diagnostic_messages: Found %d signal(s)", (int)found_signals.size());
 }
 
-/**
- * @fn void find_can_signals(const openxc_DynamicField& key, std::vector<can_signal_t*>& found_signals)
- * @brief return signals name found searching through CAN_signals and OBD2 pid
- *
- * @param[in] key - can contain numeric or string value in order to search against
- *   can signals or obd2 signals name.
- * @param[out] found_signals - provided vector to fill with ponter to signals matched.
- *
- */
+/// @brief return signals name found searching through CAN signals list.
+///
+/// @param[in] key - can contain numeric or string value in order to search against
+///   can signals or obd2 signals name.
+/// @param[out] found_signals - provided vector to fill with pointer to matched signals.
+///
 void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vector<can_signal_t*>& found_signals)
 {
        switch(key.type)
@@ -147,4 +130,4 @@ void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vect
                        break;
        }
        DEBUG(binder_interface, "find_can_signals: Found %d signal(s)", (int)found_signals.size());
-}
\ No newline at end of file
+}