X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fbinding%2Flow-can-cb.cpp;h=dcfa8d4501c321b52aeb9dd6d407a306a091e38d;hb=d51d8905b74e403dcaf2e70295bafa7113fae264;hp=dad1438fc7b0a93bea3aeb70967644f9bb13e397;hpb=69922a959e9c21055e0d0e782bb936c477f0da02;p=apps%2Fagl-service-can-low-level.git diff --git a/CAN-binder/low-can-binding/binding/low-can-cb.cpp b/CAN-binder/low-can-binding/binding/low-can-cb.cpp index dad1438f..dcfa8d45 100644 --- a/CAN-binder/low-can-binding/binding/low-can-cb.cpp +++ b/CAN-binder/low-can-binding/binding/low-can-cb.cpp @@ -19,6 +19,7 @@ #include "low-can-hat.hpp" #include +#include #include #include #include @@ -58,6 +59,10 @@ low_can_subscription_t::low_can_subscription_t(struct event_filter_t event_filte : event_filter_{event_filter} {} +low_can_subscription_t::low_can_subscription_t(struct event_filter_t event_filter, std::shared_ptr diagnostic_message) + : event_filter_{event_filter}, diagnostic_message_{diagnostic_message} +{} + low_can_subscription_t::low_can_subscription_t( low_can_subscription_t&& s) : index_{s.index_}, event_filter_{s.event_filter_}, @@ -139,6 +144,9 @@ int low_can_subscription_t::create_rx_filter(std::shared_ptr sig) /// @return 0 if ok else -1 int low_can_subscription_t::create_rx_filter() { + if (can_signal_ == nullptr) + {return -1;} + // Make sure that socket has been opened. if(! socket_) { @@ -154,7 +162,7 @@ int low_can_subscription_t::create_rx_filter() float val = (float)(1 << can_signal_->get_bit_size()) - 1; struct timeval freq; - frequency_clock_t f(event_filter_.frequency); + frequency_clock_t f = event_filter_.frequency > 0.0f ? frequency_clock_t(event_filter_.frequency) : can_signal_->get_frequency(); freq = f.get_timeval_from_period(); bcm_msg.msg_head.opcode = RX_SETUP; @@ -316,27 +324,15 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, return make_subscription_unsubscription(request, can_subscription, s, subscribe); } -/// -/// @brief subscribe to all signals in the vector signals -/// -/// @param[in] afb_req request : contain original request use to subscribe or unsubscribe -/// @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription -/// @param[in] signals - struct containing vectors with can_signal_t and diagnostic_messages to subscribe -/// -/// @return Number of correctly subscribed signal -/// -static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const struct utils::signals_found& signals, struct event_filter_t& event_filter) +int subscribe_unsubscribe_diagnostic_messages(struct afb_req request, bool subscribe, std::vector > diagnostic_messages, struct event_filter_t& event_filter) { int rets = 0; - - //TODO: Implement way to dynamically call the right function no matter - // how much signals types we have. application_t& conf = application_t::instance(); + diagnostic_manager_t& diag_m = conf.get_diagnostic_manager(); - for(const auto& sig : signals.diagnostic_messages) + for(const auto& sig : diagnostic_messages) { - int ret = 0; - diagnostic_manager_t& diag_m = conf.get_diagnostic_manager(); + active_diagnostic_request_t* adr; DiagnosticRequest* diag_req = conf.get_request_from_diagnostic_message(sig->get_name()); // If the requested diagnostic message isn't supported by the car then unsubcribe it @@ -346,7 +342,7 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, { float frequency = std::isnan(event_filter.frequency) ? sig->get_frequency() : event_filter.frequency; - diag_m.add_recurring_request(diag_req, sig->get_name().c_str(), false, sig->get_decoder(), sig->get_callback(), frequency); + adr = diag_m.add_recurring_request(diag_req, sig->get_name().c_str(), false, sig->get_decoder(), sig->get_callback(), frequency); //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, diagnostic_message_t::decode_obd2_response, diagnostic_message_t::check_ignition_status, frequency); } else @@ -359,15 +355,21 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, return -1; } - std::shared_ptr can_subscription(new low_can_subscription_t(event_filter)); - ret = subscribe_unsubscribe_signal(request, subscribe, can_subscription); + std::shared_ptr can_subscription(new low_can_subscription_t(event_filter, std::shared_ptr(adr))); + int ret = subscribe_unsubscribe_signal(request, subscribe, can_subscription); if(ret < 0) return ret; rets++; DEBUG(binder_interface, "%s: Signal: %s subscribed", __FUNCTION__, sig->get_name().c_str()); } - for(const auto& sig: signals.can_signals) + return rets; +} + +int subscribe_unsubscribe_can_signals(struct afb_req request, bool subscribe, std::vector > can_signals, struct event_filter_t& event_filter) +{ + int rets = 0; + for(const auto& sig: can_signals) { std::shared_ptr can_subscription(new low_can_subscription_t(event_filter)); if(can_subscription->create_rx_filter(sig) < 0) @@ -383,7 +385,26 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, return rets; } -static int one_subscribe_unsubscribe(struct afb_req request, bool subscribe, const std::string& tag, struct json_object *event) +/// +/// @brief subscribe to all signals in the vector signals +/// +/// @param[in] afb_req request : contain original request use to subscribe or unsubscribe +/// @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription +/// @param[in] signals - struct containing vectors with can_signal_t and diagnostic_messages to subscribe +/// +/// @return Number of correctly subscribed signal +/// +static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const struct utils::signals_found& signals, struct event_filter_t& event_filter) +{ + int rets = 0; + + rets += subscribe_unsubscribe_diagnostic_messages(request, subscribe, signals.diagnostic_messages, event_filter); + rets += subscribe_unsubscribe_can_signals(request, subscribe, signals.can_signals, event_filter); + + return rets; +} + +static int one_subscribe_unsubscribe(struct afb_req request, bool subscribe, const std::string& tag, json_object* args) { int ret = 0; struct event_filter_t event_filter; @@ -391,7 +412,7 @@ static int one_subscribe_unsubscribe(struct afb_req request, bool subscribe, con struct utils::signals_found sf; // computes the filter - if (json_object_object_get_ex(event, "filter", &filter)) + if (json_object_object_get_ex(args, "filter", &filter)) { if (json_object_object_get_ex(filter, "frequency", &obj) && (json_object_is_type(obj, json_type_double) || json_object_is_type(obj, json_type_int))) @@ -432,11 +453,11 @@ static void do_subscribe_unsubscribe(struct afb_req request, bool subscribe) args = afb_req_json(request); if (args == NULL || !json_object_object_get_ex(args, "event", &event)) { - rc = one_subscribe_unsubscribe(request, subscribe, "*", NULL); + rc = one_subscribe_unsubscribe(request, subscribe, "*", args); } else if (json_object_get_type(event) != json_type_array) { - rc = one_subscribe_unsubscribe(request, subscribe, json_object_get_string(event), event); + rc = one_subscribe_unsubscribe(request, subscribe, json_object_get_string(event), args); } else { @@ -445,7 +466,7 @@ static void do_subscribe_unsubscribe(struct afb_req request, bool subscribe) for (i = 0 ; i < n ; i++) { x = json_object_array_get_idx(event, i); - rc2 = one_subscribe_unsubscribe(request, subscribe, json_object_get_string(x), x); + rc2 = one_subscribe_unsubscribe(request, subscribe, json_object_get_string(x), args); if (rc >= 0) rc = rc2 >= 0 ? rc + rc2 : rc2; }