X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.cpp;h=184d4688bcd9164c6cba1e9204946e0b757735fa;hb=11896f4d36c4c5c81cf86e8356eb5b3777272f4b;hp=85840f80f506e481cc8b6441116a96a92b0a9d39;hpb=7617950b0ab386949b43c6f221b02826e18548d6;p=apps%2Fagl-service-can-low-level.git diff --git a/src/configuration.cpp b/src/configuration.cpp index 85840f80..184d4688 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -19,54 +19,21 @@ #include "utils/signals.hpp" -// Pre-defined OBD-II PIDs to query for if supported by the vehicle. - std::vector OBD2_PIDS = { - obd2_signal_t(0x04, "engine.load", 0, 100, POURCENT, 5, false), - obd2_signal_t(0x05, "engine.coolant.temperature", -40, 215, DEGREES_CELSIUS, 1, false), - obd2_signal_t(0x0a, "fuel.pressure", 0, 765, KPA, 1, false), - obd2_signal_t(0x0b, "intake.manifold.pressure", 0, 255, KPA, 1, false), - obd2_signal_t(0x0c, "engine.speed", 0, 16383, RPM, 5, false), - obd2_signal_t(0x0d, "vehicle.speed", 0, 255, KM_H, 5, false), - obd2_signal_t(0x0f, "intake.air.temperature", -40, 215, DEGREES_CELSIUS, 1, false), - obd2_signal_t(0x10, "mass.airflow", 0, 655, GRAMS_SEC, 5, false), - obd2_signal_t(0x11, "throttle.position", 0, 100, POURCENT, 5, false), - obd2_signal_t(0x1f, "running.time", 0, 65535, SECONDS, 1, false), - obd2_signal_t(0x2d, "EGR.error", -100, 99, POURCENT, 0, false), - obd2_signal_t(0x2f, "fuel.level", 0, 100, POURCENT, 1, false), - obd2_signal_t(0x33, "barometric.pressure", 0, 255, KPA, 1, false), - obd2_signal_t(0x4c, "commanded.throttle.position", 0, 100, POURCENT, 1, false), - obd2_signal_t(0x52, "ethanol.fuel.percentage", 0, 100, POURCENT, 1, false), - obd2_signal_t(0x5a, "accelerator.pedal.position", 0, 100, POURCENT, 5, false), - obd2_signal_t(0x5b, "hybrid.battery-pack.remaining.life", 0, 100, POURCENT, 5, false), - obd2_signal_t(0x5c, "engine.oil.temperature",-40, 210, DEGREES_CELSIUS, 1, false), - obd2_signal_t(0x63, "engine.torque", 0, 65535, NM, 1, false) -}; - -// Dumb signals and message implementation. To get compile. -std::vector CAN_MESSAGE_SET; - -std::vector> CAN_MESSAGES_DEFINTION; - -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() - : can_message_set_{CAN_MESSAGE_SET}, can_signals_{SIGNALS}, obd2_signals_{OBD2_PIDS}, can_message_definition_{CAN_MESSAGES_DEFINTION} -{} - -configuration_t& configuration_t::get_configuration() +can_bus_t& configuration_t::get_can_bus_manager() { - return *this; + return can_bus_manager_; } -can_bus_t& configuration_t::get_can_bus_manager() +const std::map>& configuration_t::get_can_bus_devices() { - return can_bus_manager_; + return can_bus_manager_.get_can_devices(); } diagnostic_manager_t& configuration_t::get_diagnostic_manager() @@ -89,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(); } @@ -119,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) @@ -168,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()); +}