X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fconfiguration.cpp;h=cfa728e715871c42e022d547b24662b78e491315;hb=e2411259c39a880338bd2435e994c21268eb3e5c;hp=0c5e8d08646fc83a5447cf16c860065a38b6673c;hpb=c01da10d067038794eb845735e2a7959744ca2b3;p=apps%2Fagl-service-can-low-level.git diff --git a/src/configuration.cpp b/src/configuration.cpp index 0c5e8d08..cfa728e7 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -15,17 +15,13 @@ * limitations under the License. */ -///////////////////////////////////////////////////////////////////////////////////// -// THIS IS AN EXAMPLE -///////////////////////////////////////////////////////////////////////////////////// +#include "configuration.hpp" -#include +#include "utils/signals.hpp" #define OBD2_FUNCTIONAL_BROADCAST_ID 0x7df -/* -* Pre-defined OBD-II PIDs to query for if supported by the vehicle. -*/ +// 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}, @@ -48,28 +44,120 @@ { 0x63, "obd2.engine.torque", 0, 65535, NM, 1, false} }; -std::vector CAN_MESSAGE_SET = +// Dumb signals and message implementation. To get compile. +std::vector CAN_MESSAGE_SET; + +std::vector> CAN_MESSAGES_DEFINTION; + +std::vector> SIGNALS; + +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() { - {0, "example_messages", 1, 2, 2, 0, 19}, -}; + return *this; +} -std::vector> CAN_MESSAGES_DEFINTION = { - { - {0x620, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL}, - {0x442, CanMessageFormat::STANDARD, {10, 0, nullptr}, false, (uint8_t)NULL}, - }, -}; +can_bus_t& configuration_t::get_can_bus_manager() +{ + return can_bus_manager_; +} + +diagnostic_manager_t& configuration_t::get_diagnostic_manager() +{ + return diagnostic_manager_; +} + +uint8_t configuration_t::get_active_message_set() const +{ + return active_message_set_; +} + +const std::vector& configuration_t::get_can_message_set() +{ + return can_message_set_; +} + +std::vector& configuration_t::get_can_signals() +{ + return can_signals_[active_message_set_]; +} + +const std::vector& configuration_t::get_can_message_definition() +{ + return can_message_definition_[active_message_set_]; +} + +std::vector& configuration_t::get_obd2_signals() +{ + return obd2_signals_[active_message_set_]; +} + +uint32_t configuration_t::get_signal_id(obd2_signal_t& sig) const +{ + return sig.get_pid(); +} + +uint32_t configuration_t::get_signal_id(can_signal_t& sig) const +{ + return sig.get_message().get_id(); +} + +void configuration_t::set_active_message_set(uint8_t id) +{ + active_message_set_ = id; +} /** - * @brief Dumb SIGNALS array. It is composed by CanMessageSet - * SIGNALS[MESSAGE_SET_ID][CanSignal] + * @fn std::vector find_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. */ -std::vector> SIGNALS = { +void configuration_t::find_obd2_signals(const openxc_DynamicField &key, std::vector& found_signals) +{ + switch(key.type) { - {&(CAN_MESSAGES_DEFINTION[MESSAGE_SET_ID][0]), "can.driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, 0.0}, - {&(CAN_MESSAGES_DEFINTION[MESSAGE_SET_ID][1]), "can.driver_door.close", 0, 4, 1.000000, 0.000000, 0.000000, 0.000000, {10, 0, nullptr}, false, true, nullptr, 0, false, decoder_t::booleanDecoder, nullptr, false, 0.0} - }, -}; + case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING: + lookup_signals_by_name(key.string_value, obd2_signals_[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); + break; + default: + ERROR(binder_interface, "find_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()); +} -configuration_t::configuration_t() - : obd2_signals_{OBD2_PIDS}, can_message_set_{CAN_MESSAGE_SET}, can_signals_{SIGNALS}, can_message_definition_{CAN_MESSAGES_DEFINTION} \ No newline at end of file +/** + * @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. + * + */ +void configuration_t::find_can_signals(const openxc_DynamicField& key, std::vector& found_signals) +{ + switch(key.type) + { + case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING: + lookup_signals_by_name(std::string(key.string_value), can_signals_[active_message_set_], found_signals); + break; + case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM: + 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."); + break; + } + DEBUG(binder_interface, "Found %d signal(s)", (int)found_signals.size()); +} \ No newline at end of file