X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.cpp;h=d8c44a719d8742367bae2984f9b41dbbb1cdbb91;hb=ca722832efce48e92842b246eb5831c58e7a8d8e;hp=aeecdb6a50e7544d460877c02e24945ebdc6e0c1;hpb=72305e67ee45ba6b56bca48b17303bf0322a8209;p=apps%2Fagl-service-can-low-level.git diff --git a/src/configuration.cpp b/src/configuration.cpp index aeecdb6a..d8c44a71 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -19,41 +19,18 @@ #include "utils/signals.hpp" -#define OBD2_FUNCTIONAL_BROADCAST_ID 0x7df - -// Pre-defined OBD-II PIDs to query for if supported by the vehicle. - std::vector OBD2_PIDS = { - { 0x04, "obd2.engine.load", 0, 100, POURCENT, 5, false}, - { 0x05, "obd2.engine.coolant.temperature", -40, 215, DEGREES_CELSIUS, 1, false}, - { 0x0a, "obd2.fuel.pressure", 0, 765, KPA, 1, false}, - { 0x0b, "obd2.intake.manifold.pressure", 0, 255, KPA, 1, false}, - { 0x0c, "obd2.engine.speed", 0, 16383, RPM, 5, false}, - { 0x0d, "obd2.vehicle.speed", 0, 255, KM_H, 5, false}, - { 0x0f, "obd2.intake.air.temperature", -40, 215, DEGREES_CELSIUS, 1, false}, - { 0x10, "obd2.mass.airflow", 0, 655, GRAMS_SEC, 5, false}, - { 0x11, "obd2.throttle.position", 0, 100, POURCENT, 5, false}, - { 0x1f, "obd2.running.time", 0, 65535, SECONDS, 1, false}, - { 0x2d, "obd2.EGR.error", -100, 99, POURCENT, 0, false}, - { 0x2f, "obd2.fuel.level", 0, 100, POURCENT, 1, false}, - { 0x33, "obd2.barometric.pressure", 0, 255, KPA, 1, false}, - { 0x4c, "obd2.commanded.throttle.position", 0, 100, POURCENT, 1, false}, - { 0x52, "obd2.ethanol.fuel.percentage", 0, 100, POURCENT, 1, false}, - { 0x5a, "obd2.accelerator.pedal.position", 0, 100, POURCENT, 5, false}, - { 0x5b, "obd2.hybrid.battery-pack.remaining.life", 0, 100, POURCENT, 5, false}, - { 0x5c, "obd2.engine.oil.temperature",-40, 210, DEGREES_CELSIUS, 1, false}, - { 0x63, "obd2.engine.torque", 0, 65535, NM, 1, false} -}; - // Dumb signals and message implementation. To get compile. -std::vector CAN_MESSAGE_SET; +/*std::vector CAN_MESSAGE_SET; -std::vector> CAN_MESSAGES_DEFINTION; +std::vector> CAN_MESSAGES_DEFINITION; -std::vector> SIGNALS; +std::vector> SIGNALS;*/ -configuration_t::configuration_t() - : obd2_signals_{OBD2_PIDS}, can_message_set_{CAN_MESSAGE_SET}, can_signals_{SIGNALS}, can_message_definition_{CAN_MESSAGES_DEFINTION} -{} +configuration_t& configuration_t::instance() +{ + static configuration_t config; + return config; +} configuration_t& configuration_t::get_configuration() { @@ -65,6 +42,11 @@ can_bus_t& configuration_t::get_can_bus_manager() return can_bus_manager_; } +const std::vector>& configuration_t::get_can_bus_devices() +{ + return can_bus_manager_.get_can_devices(); +} + diagnostic_manager_t& configuration_t::get_diagnostic_manager() { return diagnostic_manager_; @@ -85,14 +67,19 @@ std::vector& configuration_t::get_can_signals() return can_signals_[active_message_set_]; } -const std::vector& configuration_t::get_can_message_definition() +std::vector& configuration_t::get_obd2_signals() { - return can_message_definition_[active_message_set_]; + return obd2_signals_[active_message_set_]; } -std::vector& configuration_t::get_obd2_signals() +const std::vector& configuration_t::get_signals_prefix() const { - return obd2_signals_[active_message_set_]; + return signals_prefix_; +} + +const std::vector& configuration_t::get_can_message_definition() +{ + return can_message_definition_[active_message_set_]; } uint32_t configuration_t::get_signal_id(obd2_signal_t& sig) const @@ -111,13 +98,13 @@ void configuration_t::set_active_message_set(uint8_t id) } /** - * @fn std::vector find_signals(const openxc_DynamicField &key) + * @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 + * + * @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. + * @return Vector of signals name found. */ void configuration_t::find_obd2_signals(const openxc_DynamicField &key, std::vector& found_signals) { @@ -130,7 +117,7 @@ void configuration_t::find_obd2_signals(const openxc_DynamicField &key, std::vec lookup_signals_by_id(key.numeric_value, obd2_signals_[active_message_set_], found_signals); break; default: - ERROR(binder_interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only."); + ERROR(binder_interface, "find_obd2_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()); @@ -139,8 +126,8 @@ void configuration_t::find_obd2_signals(const openxc_DynamicField &key, std::vec /** * @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 + * + * @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. * @@ -156,7 +143,7 @@ void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vect lookup_signals_by_id(key.numeric_value, can_signals_[active_message_set_], found_signals); break; default: - ERROR(binder_interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only."); + 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());