X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fconfiguration.cpp;h=184d4688bcd9164c6cba1e9204946e0b757735fa;hb=3a9e5d4c0baad5ce652f83938ecd2e61063cb46d;hp=d8c44a719d8742367bae2984f9b41dbbb1cdbb91;hpb=d1282ada6335171914a23c328c8a17c809557e62;p=apps%2Fagl-service-can-low-level.git diff --git a/src/configuration.cpp b/src/configuration.cpp index d8c44a71..184d4688 100644 --- 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; - -std::vector> CAN_MESSAGES_DEFINITION; - -std::vector> 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>& configuration_t::get_can_bus_devices() +const std::map>& configuration_t::get_can_bus_devices() { return can_bus_manager_.get_can_devices(); } @@ -67,22 +56,22 @@ std::vector& configuration_t::get_can_signals() return can_signals_[active_message_set_]; } -std::vector& configuration_t::get_obd2_signals() +std::vector& configuration_t::get_diagnostic_messages() { - return obd2_signals_[active_message_set_]; + return diagnostic_messages_[active_message_set_]; } -const std::vector& configuration_t::get_signals_prefix() const +const std::vector& configuration_t::get_can_message_definition() { - return signals_prefix_; + return can_message_definition_[active_message_set_]; } -const std::vector& 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 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& 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& 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, "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& 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& found_signals) { switch(key.type) @@ -146,5 +129,5 @@ void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vect ERROR(binder_interface, "find_can_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only."); break; } - DEBUG(binder_interface, "Found %d signal(s)", (int)found_signals.size()); -} \ No newline at end of file + DEBUG(binder_interface, "find_can_signals: Found %d signal(s)", (int)found_signals.size()); +}