X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=low-can-binding%2Fbinding%2Flow-can-cb.cpp;h=dbeaa5553a792976e735acd0d7a87312c3532f6c;hb=f9b67aecdc07d31def64175e0f58e9c0a113f94c;hp=6b8690735bf8e7901927aed099958deeb4fbc6dd;hpb=9f0d5da859bfe7778394f35baf48fbe77f1ed7d9;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp index 6b869073..dbeaa555 100644 --- a/low-can-binding/binding/low-can-cb.cpp +++ b/low-can-binding/binding/low-can-cb.cpp @@ -31,8 +31,8 @@ #include "application.hpp" #include "../can/can-encoder.hpp" #include "../can/can-bus.hpp" -#include "../can/can-signals.hpp" -#include "../can/can-message.hpp" +#include "../can/signals.hpp" +#include "../can/message/message.hpp" #include "../utils/signals.hpp" #include "../diagnostic/diagnostic-message.hpp" #include "../utils/openxc-utils.hpp" @@ -70,12 +70,12 @@ void on_no_clients(std::shared_ptr can_subscription, std s.erase(it); } -static void push_n_notify(std::shared_ptr m) +static void push_n_notify(std::shared_ptr m) { can_bus_t& cbm = application_t::instance().get_can_bus_manager(); { std::lock_guard can_message_lock(cbm.get_can_message_mutex()); - cbm.push_new_can_message(*m); + cbm.push_new_can_message(m); } cbm.get_new_can_message_cv().notify_one(); } @@ -88,7 +88,7 @@ int read_message(sd_event_source *event_source, int fd, uint32_t revents, void * if ((revents & EPOLLIN) != 0) { std::shared_ptr s = can_subscription->get_socket(); - std::shared_ptr message = s->read_message(); + std::shared_ptr message = s->read_message(); // Sure we got a valid CAN message ? if (! message->get_id() == 0 && ! message->get_length() == 0) @@ -241,14 +241,14 @@ static int subscribe_unsubscribe_diagnostic_messages(afb_req_t request, return rets; } -static int subscribe_unsubscribe_can_signals(afb_req_t request, +static int subscribe_unsubscribe_signals(afb_req_t request, bool subscribe, - std::vector > can_signals, + std::vector > signals, struct event_filter_t& event_filter, std::map >& s) { int rets = 0; - for(const auto& sig: can_signals) + for(const auto& sig: signals) { auto it = std::find_if(s.begin(), s.end(), [&sig, &event_filter](std::pair > sub){ return sub.second->is_signal_subscription_corresponding(sig, event_filter) ; }); std::shared_ptr can_subscription; @@ -256,7 +256,7 @@ static int subscribe_unsubscribe_can_signals(afb_req_t request, {can_subscription = it->second;} else { - can_subscription = std::make_shared(low_can_subscription_t(event_filter)); + can_subscription = std::make_shared(low_can_subscription_t(event_filter)); if(can_subscription->create_rx_filter(sig) < 0) {return -1;} if(add_to_event_loop(can_subscription) < 0) @@ -277,7 +277,7 @@ static int subscribe_unsubscribe_can_signals(afb_req_t request, /// /// @param[in] afb_req request : contains original request use to subscribe or unsubscribe /// @param[in] subscribe boolean value, which chooses between a subscription operation or an unsubscription -/// @param[in] signals - struct containing vectors with can_signal_t and diagnostic_messages to subscribe +/// @param[in] signals - struct containing vectors with signal_t and diagnostic_messages to subscribe /// /// @return Number of correctly subscribed signal /// @@ -293,22 +293,17 @@ static int subscribe_unsubscribe_signals(afb_req_t request, std::map >& s = sm.get_subscribed_signals(); rets += subscribe_unsubscribe_diagnostic_messages(request, subscribe, signals.diagnostic_messages, event_filter, s, false); - rets += subscribe_unsubscribe_can_signals(request, subscribe, signals.can_signals, event_filter, s); + rets += subscribe_unsubscribe_signals(request, subscribe, signals.signals, event_filter, s); return rets; } -static int one_subscribe_unsubscribe(afb_req_t request, - bool subscribe, - const std::string& tag, - json_object* args) +static event_filter_t generate_filter(json_object* args) { - int ret = 0; - struct event_filter_t event_filter; + event_filter_t event_filter; struct json_object *filter, *obj; - struct utils::signals_found sf; - // computes the filter + // computes the filter if (json_object_object_get_ex(args, "filter", &filter)) { if (json_object_object_get_ex(filter, "frequency", &obj) @@ -321,41 +316,111 @@ static int one_subscribe_unsubscribe(afb_req_t request, && (json_object_is_type(obj, json_type_double) || json_object_is_type(obj, json_type_int))) {event_filter.max = (float)json_object_get_double(obj);} } + return event_filter; +} + + +static int one_subscribe_unsubscribe_events(afb_req_t request, bool subscribe, const std::string& tag, json_object* args) +{ + int ret = 0; + struct utils::signals_found sf; // subscribe or unsubscribe openxc_DynamicField search_key = build_DynamicField(tag); sf = utils::signals_manager_t::instance().find_signals(search_key); - if (sf.can_signals.empty() && sf.diagnostic_messages.empty()) + if (sf.signals.empty() && sf.diagnostic_messages.empty()) { AFB_NOTICE("No signal(s) found for %s.", tag.c_str()); ret = -1; } else - {ret = subscribe_unsubscribe_signals(request, subscribe, sf, event_filter);} + { + event_filter_t event_filter = generate_filter(args); + ret = subscribe_unsubscribe_signals(request, subscribe, sf, event_filter); + } + return ret; +} + +static int one_subscribe_unsubscribe_id(afb_req_t request, bool subscribe, const uint32_t& id ,json_object *args) +{ + int ret = 0; + std::shared_ptr message_definition = application_t::instance().get_message_definition(id); + struct utils::signals_found sf; + if(message_definition) + { + sf.signals = message_definition->get_signals(); + } + + if(sf.signals.empty()) + { + AFB_NOTICE("No signal(s) found for %d.", id); + ret = -1; + } + else + { + event_filter_t event_filter = generate_filter(args); + ret = subscribe_unsubscribe_signals(request, subscribe, sf, event_filter); + } return ret; } + + static int process_one_subscribe_args(afb_req_t request, bool subscribe, json_object *args) { int rc = 0, rc2=0; - json_object *x = nullptr, *event = nullptr; - if(args == NULL || - !json_object_object_get_ex(args, "event", &event)) + json_object *x = nullptr, *event = nullptr, *id = nullptr; + + + // 2 cases : ID(PGN) and event + + json_bool test_event = json_object_object_get_ex(args,"event",&event); + json_bool test_id = json_object_object_get_ex(args,"id",&id); + if(!test_id) { - rc = one_subscribe_unsubscribe(request, subscribe, "*", args); + json_object_object_get_ex(args,"pgn",&id); } - else if (json_object_get_type(event) != json_type_array) + + if( args == NULL || (!test_event && !id)) { - rc = one_subscribe_unsubscribe(request, subscribe, json_object_get_string(event), args); + rc = one_subscribe_unsubscribe_events(request, subscribe, "*", args); } else { - for (int i = 0 ; i < json_object_array_length(event); i++) + if(event) + { + if (json_object_get_type(event) != json_type_array) // event is set before and check if it's an array + { + rc = one_subscribe_unsubscribe_events(request, subscribe, json_object_get_string(event), args); + } + else // event is set and it's not an array + { + for (int i = 0 ; i < json_object_array_length(event); i++) + { + x = json_object_array_get_idx(event, i); + rc2 = one_subscribe_unsubscribe_events(request, subscribe, json_object_get_string(x), args); + if (rc >= 0) + rc = rc2 >= 0 ? rc + rc2 : rc2; + } + } + } + + if(id) { - x = json_object_array_get_idx(event, i); - rc2 = one_subscribe_unsubscribe(request, subscribe, json_object_get_string(x), args); - if (rc >= 0) - rc = rc2 >= 0 ? rc + rc2 : rc2; + if (json_object_get_type(id) != json_type_array) // id is set before and check if it's an array + { + rc = one_subscribe_unsubscribe_id(request, subscribe, json_object_get_int(id), args); + } + else // event is set and it's not an array + { + for (int i = 0 ; i < json_object_array_length(id); i++) + { + x = json_object_array_get_idx(id, i); + rc2 = one_subscribe_unsubscribe_id(request, subscribe, json_object_get_int(x), args); + if (rc >= 0) + rc = rc2 >= 0 ? rc + rc2 : rc2; + } + } } } return rc; @@ -413,7 +478,7 @@ static int send_frame(struct canfd_frame& cfd, const std::string& bus_name) if( cd.count(bus_name) == 0) {cd[bus_name] = std::make_shared(low_can_subscription_t());} - return cd[bus_name]->tx_send(cfd, bus_name); + return low_can_subscription_t::tx_send(*cd[bus_name], cfd, bus_name); } static void write_raw_frame(afb_req_t request, const std::string& bus_name, json_object *json_value) @@ -466,13 +531,13 @@ static void write_signal(afb_req_t request, const std::string& name, json_object sf = utils::signals_manager_t::instance().find_signals(search_key); openxc_DynamicField dynafield_value = build_DynamicField(json_value); - if (sf.can_signals.empty()) + if (sf.signals.empty()) { afb_req_fail_f(request, "No signal(s) found for %s. Message not sent.", name.c_str()); return; } - std::shared_ptr& sig = sf.can_signals[0]; + std::shared_ptr& sig = sf.signals[0]; if(! sig->get_writable()) { afb_req_fail_f(request, "%s isn't writable. Message not sent.", sig->get_name().c_str()); @@ -521,13 +586,13 @@ static struct json_object *get_signals_value(const std::string& name) openxc_DynamicField search_key = build_DynamicField(name); sf = utils::signals_manager_t::instance().find_signals(search_key); - if (sf.can_signals.empty()) + if (sf.signals.empty()) { AFB_WARNING("No signal(s) found for %s.", name.c_str()); return NULL; } ans = json_object_new_array(); - for(const auto& sig: sf.can_signals) + for(const auto& sig: sf.signals) { struct json_object *jobj = json_object_new_object(); json_object_object_add(jobj, "event", json_object_new_string(sig->get_name().c_str())); @@ -575,13 +640,13 @@ static struct json_object *list_can_message(const std::string& name) openxc_DynamicField search_key = build_DynamicField(name); sf = utils::signals_manager_t::instance().find_signals(search_key); - if (sf.can_signals.empty() && sf.diagnostic_messages.empty()) + if (sf.signals.empty() && sf.diagnostic_messages.empty()) { AFB_WARNING("No signal(s) found for %s.", name.c_str()); return NULL; } ans = json_object_new_array(); - for(const auto& sig: sf.can_signals) + for(const auto& sig: sf.signals) { json_object_array_add(ans, json_object_new_string(sig->get_name().c_str())); @@ -635,6 +700,7 @@ int init_binding(afb_api_t api) can_bus_manager.set_can_devices(); can_bus_manager.start_threads(); + utils::signals_manager_t& sm = utils::signals_manager_t::instance(); /// Initialize Diagnostic manager that will handle obd2 requests. /// We pass by default the first CAN bus device to its Initialization. @@ -644,16 +710,15 @@ int init_binding(afb_api_t api) // Add a recurring dignostic message request to get engine speed at all times. openxc_DynamicField search_key = build_DynamicField("diagnostic_messages.engine.speed"); - struct utils::signals_found sf = utils::signals_manager_t::instance().find_signals(search_key); + struct utils::signals_found sf = sm.find_signals(search_key); - if(sf.can_signals.empty() && sf.diagnostic_messages.size() == 1) + if(sf.signals.empty() && sf.diagnostic_messages.size() == 1) { afb_req_t request = nullptr; struct event_filter_t event_filter; event_filter.frequency = sf.diagnostic_messages.front()->get_frequency(); - utils::signals_manager_t& sm = utils::signals_manager_t::instance(); std::map >& s = sm.get_subscribed_signals(); subscribe_unsubscribe_diagnostic_messages(request, true, sf.diagnostic_messages, event_filter, s, true);