///
///*******************************************************************************/
-void on_no_clients(std::shared_ptr<low_can_subscription_t> can_subscription, uint32_t pid, std::map<int, std::shared_ptr<low_can_subscription_t> >& s)
+void on_no_clients(std::shared_ptr<low_can_subscription_t> can_subscription, uint32_t pid, map_subscription& s)
{
bool is_permanent_recurring_request = false;
on_no_clients(can_subscription, s);
}
-void on_no_clients(std::shared_ptr<low_can_subscription_t> can_subscription, std::map<int, std::shared_ptr<low_can_subscription_t> >& s)
+void on_no_clients(std::shared_ptr<low_can_subscription_t> can_subscription, map_subscription& s)
{
auto it = s.find(can_subscription->get_index());
s.erase(it);
}
// check if error or hangup
- if ((revents & (EPOLLERR|EPOLLRDHUP|EPOLLHUP)) != 0)
+ if ((revents & (EPOLLERR | EPOLLRDHUP | EPOLLHUP)) != 0)
{
sd_event_source_unref(event_source);
can_subscription->get_socket()->close();
static int subscribe_unsubscribe_signal(afb_req_t request,
bool subscribe,
std::shared_ptr<low_can_subscription_t>& can_subscription,
- std::map<int, std::shared_ptr<low_can_subscription_t> >& s)
+ map_subscription& s)
{
int ret = 0;
int sub_index = can_subscription->get_index();
}
static int subscribe_unsubscribe_diagnostic_messages(afb_req_t request,
- bool subscribe,
- std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages,
- struct event_filter_t& event_filter,
- std::map<int, std::shared_ptr<low_can_subscription_t> >& s,
- bool perm_rec_diag_req)
+ bool subscribe,
+ list_ptr_diag_msg_t diagnostic_messages,
+ struct event_filter_t& event_filter,
+ map_subscription& s,
+ bool perm_rec_diag_req)
{
int rets = 0;
application_t& app = application_t::instance();
// poll a PID for nothing.
if(sig->get_supported() && subscribe)
{
- if (!app.isEngineOn())
+ if (!app.is_engine_on())
AFB_WARNING("signal: Engine is off, %s won't received responses until it's on", sig->get_name().c_str());
diag_m.add_recurring_request(diag_req, sig->get_name().c_str(), false, sig->get_decoder(), sig->get_callback(), event_filter.frequency, perm_rec_diag_req);
if(can_subscription->create_rx_filter(sig) < 0)
- {return -1;}
+ return -1;
AFB_DEBUG("Signal: %s subscribed", sig->get_name().c_str());
if(it == s.end() && add_to_event_loop(can_subscription) < 0)
{
}
static int subscribe_unsubscribe_signals(afb_req_t request,
- bool subscribe,
- std::vector<std::shared_ptr<signal_t> > signals,
- struct event_filter_t& event_filter,
- std::map<int, std::shared_ptr<low_can_subscription_t> >& s)
+ bool subscribe,
+ list_ptr_signal_t signals,
+ struct event_filter_t& event_filter,
+ map_subscription& s)
{
int rets = 0;
for(const auto& sig: signals)
});
std::shared_ptr<low_can_subscription_t> can_subscription;
if(it != s.end())
- {can_subscription = it->second;}
+ can_subscription = it->second;
else
{
can_subscription = std::make_shared<low_can_subscription_t>(low_can_subscription_t(event_filter));
if(can_subscription->create_rx_filter(sig) < 0)
- {return -1;}
+ return -1;
if(add_to_event_loop(can_subscription) < 0)
- {return -1;}
+ return -1;
}
if(subscribe_unsubscribe_signal(request, subscribe, can_subscription, s) < 0)
- {return -1;}
+ return -1;
rets++;
AFB_DEBUG("%s Signal: %s %ssubscribed", sig->get_message()->is_fd() ? "FD": "", sig->get_name().c_str(), subscribe ? "":"un");
/// @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 signal_t and diagnostic_messages to subscribe
+/// @param[in] event_filter - stuct containing filter on the signal
///
/// @return Number of correctly subscribed signal
///
utils::signals_manager_t& sm = utils::signals_manager_t::instance();
std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
- std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
+ map_subscription& s = sm.get_subscribed_signals();
rets += subscribe_unsubscribe_diagnostic_messages(request, subscribe, signals.diagnostic_messages, event_filter, s, false);
rets += subscribe_unsubscribe_signals(request, subscribe, signals.signals, event_filter, s);
{
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)))
- {event_filter.frequency = (float)json_object_get_double(obj);}
+ event_filter.frequency = (float)json_object_get_double(obj);
if (json_object_object_get_ex(filter, "min", &obj)
&& (json_object_is_type(obj, json_type_double) || json_object_is_type(obj, json_type_int)))
- {event_filter.min = (float)json_object_get_double(obj);}
+ event_filter.min = (float)json_object_get_double(obj);
if (json_object_object_get_ex(filter, "max", &obj)
&& (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);}
+ event_filter.max = (float)json_object_get_double(obj);
if (json_object_object_get_ex(filter, "rx_id", &obj)
&& (json_object_is_type(obj, json_type_int)))
- {event_filter.rx_id = (canid_t) json_object_get_int(obj);}
+ event_filter.rx_id = (canid_t) json_object_get_int(obj);
if (json_object_object_get_ex(filter, "tx_id", &obj)
&& (json_object_is_type(obj, json_type_int)))
- {event_filter.tx_id = (canid_t) json_object_get_int(obj);}
+ event_filter.tx_id = (canid_t) json_object_get_int(obj);
}
return event_filter;
}
// subscribe or unsubscribe
openxc_DynamicField search_key = build_DynamicField(tag);
sf = utils::signals_manager_t::instance().find_signals(search_key);
+
+
+#ifdef USE_FEATURE_ISOTP
+ if(sf.signals.size() > 1)
+ {
+ sf.signals.remove_if([](std::shared_ptr<signal_t> x){
+ bool isotp = x->get_message()->is_isotp();
+ if(isotp)
+ AFB_NOTICE("ISO TP messages need to be subscribed one by one (rx, tx)");
+
+ return isotp;
+ });
+ }
+#endif
+
if (sf.signals.empty() && sf.diagnostic_messages.empty())
{
AFB_NOTICE("No signal(s) found for %s.", tag.c_str());
return ret;
}
-static int one_subscribe_unsubscribe_id(afb_req_t request, bool subscribe, const uint32_t& id ,json_object *args)
+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_t> message_definition = application_t::instance().get_message_definition(id);
struct utils::signals_found sf;
if(message_definition)
- {
- sf.signals = message_definition->get_signals();
- }
+ sf.signals = list_ptr_signal_t(message_definition->get_signals().begin(), message_definition->get_signals().end());
if(sf.signals.empty())
{
event_filter_t event_filter = generate_filter(args);
ret = subscribe_unsubscribe_signals(request, subscribe, sf, event_filter);
}
+
return ret;
}
json_object_object_get_ex(args,"event",&event);
json_bool test_id = json_object_object_get_ex(args,"id",&id);
if(!test_id)
- {
test_id = json_object_object_get_ex(args,"pgn",&id);
- }
if( args == NULL || (id && ((std::string)json_object_get_string(id)).compare("*") == 0))
{
static int send_message(message_t *message, const std::string& bus_name, uint32_t flags, event_filter_t &event_filter, std::shared_ptr<signal_t> signal)
{
if(bus_name.empty())
- {
return -1;
- }
std::map<std::string, std::shared_ptr<low_can_subscription_t> >& cd = application_t::instance().get_can_devices();
if( cd.count(bus_name) == 0)
- {
cd[bus_name] = std::make_shared<low_can_subscription_t>(low_can_subscription_t(event_filter));
- }
cd[bus_name]->set_signal(signal);
if(flags&BCM_PROTOCOL)
- {
return low_can_subscription_t::tx_send(*cd[bus_name], message, bus_name);
- }
#ifdef USE_FEATURE_ISOTP
else if(flags&ISOTP_PROTOCOL)
- {
return low_can_subscription_t::isotp_send(*cd[bus_name], message, bus_name);
- }
#endif
#ifdef USE_FEATURE_J1939
else if(flags&J1939_PROTOCOL)
- {
return low_can_subscription_t::j1939_send(*cd[bus_name], message, bus_name);
- }
#endif
else
- {
return -1;
- }
}
static void write_raw_frame(afb_req_t request, const std::string& bus_name, message_t *message,
- struct json_object *can_data, uint32_t flags, event_filter_t &event_filter)
+ struct json_object *can_data, uint32_t flags, event_filter_t &event_filter)
{
struct utils::signals_found sf;
if( !sf.signals.empty() )
{
- AFB_DEBUG("ID WRITE RAW : %d",sf.signals[0]->get_message()->get_id());
- if(flags&BCM_PROTOCOL)
+ AFB_DEBUG("ID WRITE RAW : %d", sf.signals.front()->get_message()->get_id());
+ if(flags & BCM_PROTOCOL)
{
- if(sf.signals[0]->get_message()->is_fd())
+ if(sf.signals.front()->get_message()->is_fd())
{
AFB_DEBUG("CANFD_MAX_DLEN");
message->set_flags(CAN_FD_FRAME);
message->set_maxdlen(CAN_MAX_DLEN);
}
- if(sf.signals[0]->get_message()->is_isotp())
+ if(sf.signals.front()->get_message()->is_isotp())
{
flags = ISOTP_PROTOCOL;
message->set_maxdlen(MAX_ISOTP_FRAMES * message->get_maxdlen());
#ifdef USE_FEATURE_J1939
if(flags&J1939_PROTOCOL)
- {
message->set_maxdlen(J1939_MAX_DLEN);
- }
#endif
if(message->get_length() > 0 && message->get_length() <= message->get_maxdlen())
else
{
if(flags&BCM_PROTOCOL)
- {
afb_req_fail(request, "Invalid", "Frame BCM");
- }
else if(flags&J1939_PROTOCOL)
- {
afb_req_fail(request, "Invalid", "Frame J1939");
- }
else if(flags&ISOTP_PROTOCOL)
- {
afb_req_fail(request, "Invalid", "Frame ISOTP");
- }
else
- {
afb_req_fail(request, "Invalid", "Frame");
- }
+
return;
}
- if(! send_message(message, application_t::instance().get_can_bus_manager().get_can_device_name(bus_name), flags, event_filter, sf.signals[0]))
- {
+ if(! send_message(message, application_t::instance().get_can_bus_manager().get_can_device_name(bus_name), flags, event_filter, sf.signals.front()))
afb_req_success(request, nullptr, "Message correctly sent");
- }
else
- {
afb_req_fail(request, "Error", "sending the message. See the log for more details.");
- }
}
else
{
static void write_frame(afb_req_t request, const std::string& bus_name, json_object *json_value, event_filter_t &event_filter)
{
message_t *message;
- int id;
- int length;
+ uint32_t id;
+ uint32_t length;
struct json_object *can_data = nullptr;
std::vector<uint8_t> data;
- AFB_DEBUG("JSON content %s",json_object_get_string(json_value));
+ AFB_DEBUG("JSON content %s", json_object_get_string(json_value));
if(!wrap_json_unpack(json_value, "{si, si, so !}",
"can_id", &id,
"can_dlc", &length,
"can_data", &can_data))
{
- message = new can_message_t(0,(uint32_t)id,(uint32_t)length,false,0,data,0);
- write_raw_frame(request,bus_name,message,can_data,BCM_PROTOCOL,event_filter);
+ message = new can_message_t(0, id, length, false, 0, data, 0);
+ write_raw_frame(request, bus_name, message, can_data, BCM_PROTOCOL, event_filter);
}
#ifdef USE_FEATURE_J1939
else if(!wrap_json_unpack(json_value, "{si, si, so !}",
"length", &length,
"data", &can_data))
{
- message = new j1939_message_t((uint32_t)length,data,0,J1939_NO_NAME,(pgn_t)id,J1939_NO_ADDR);
- write_raw_frame(request,bus_name,message,can_data,J1939_PROTOCOL, event_filter);
+ message = new j1939_message_t(length, data, 0, J1939_NO_NAME, (pgn_t)id, J1939_NO_ADDR);
+ write_raw_frame(request, bus_name, message, can_data, J1939_PROTOCOL, event_filter);
}
#endif
else
return;
}
- std::shared_ptr<signal_t> sig = sf.signals[0];
+ std::shared_ptr<signal_t> sig = sf.signals.front();
if(! sig->get_writable())
{
afb_req_fail_f(request, "%s isn't writable. Message not sent.", sig->get_name().c_str());
uint32_t flags = INVALID_FLAG;
if(sig->get_message()->is_j1939())
- {
flags = J1939_PROTOCOL;
- }
else if(sig->get_message()->is_isotp())
- {
flags = ISOTP_PROTOCOL;
- }
else
- {
flags = BCM_PROTOCOL;
- }
// cfd = encoder_t::build_frame(sig, value);
- message_t *message = encoder_t::build_message(sig,value,false,false);
+ message_t *message = encoder_t::build_message(sig, value, false, false);
if(! send_message(message, sig->get_message()->get_bus_device_name(), flags, event_filter, sig) && send)
- {
afb_req_success(request, nullptr, "Message correctly sent");
- }
else
- {
afb_req_fail(request, "Error", "Sending the message. See the log for more details.");
- }
if(sig->get_message()->is_j1939())
- {
#ifdef USE_FEATURE_J1939
delete (j1939_message_t*) message;
+#else
+ afb_req_fail(request, "Warning", "J1939 not implemented in your kernel.");
#endif
- }
else
- {
delete (can_message_t*) message;
- }
}
void write(afb_req_t request)
if(json_object_object_get_ex(args,"bus_name",&name))
{
if(json_object_object_get_ex(args,"frame",&json_value))
- {
write_frame(request, (std::string)json_object_get_string(name), json_value, event_filter);
- }
else
- {
afb_req_fail(request, "Error", "Request argument malformed");
- }
}
else if(json_object_object_get_ex(args,"signal_name",&name))
{
if(json_object_object_get_ex(args,"signal_value",&json_value))
- {
write_signal(request, (std::string)json_object_get_string(name), json_value, event_filter);
- }
else
- {
afb_req_fail(request, "Error", "Request argument malformed");
- }
}
- else {
+ else
+ {
afb_req_fail(request, "Error", "Request argument malformed");
}
}
const char *name;
if ((args != nullptr) &&
(json_object_object_get_ex(args, "event", &json_name) && json_object_is_type(json_name, json_type_string)))
- {
name = json_object_get_string(json_name);
- }
else
- {
name = "*";
- }
ans = list_can_message(name);
if (!ans)
rc = -1;
if (rc >= 0)
- {
afb_req_success(request, ans, NULL);
- }
else
- {
afb_req_fail(request, "error", NULL);
- }
+
}
/// @brief Initialize the binding.
struct event_filter_t event_filter;
event_filter.frequency = sf.diagnostic_messages.front()->get_frequency();
- std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
+ map_subscription& s = sm.get_subscribed_signals();
subscribe_unsubscribe_diagnostic_messages(request, true, sf.diagnostic_messages, event_filter, s, true);
}
#ifdef USE_FEATURE_J1939
- std::vector<std::shared_ptr<message_definition_t>> current_messages_definition = application.get_messages_definition();
+ std::string j1939_bus;
+ vect_ptr_msg_def_t current_messages_definition = application.get_messages_definition();
for(std::shared_ptr<message_definition_t> message_definition: current_messages_definition)
{
if(message_definition->is_j1939())
{
- std::shared_ptr<low_can_subscription_t> low_can_j1939 = std::make_shared<low_can_subscription_t>();
+ if (j1939_bus == message_definition->get_bus_device_name() )
+ continue;
+ j1939_bus = message_definition->get_bus_device_name();
+ std::shared_ptr<low_can_subscription_t> low_can_j1939 = std::make_shared<low_can_subscription_t>();
application.set_subscription_address_claiming(low_can_j1939);
ret = low_can_subscription_t::open_socket(*low_can_j1939,
- message_definition->get_bus_device_name(),
- J1939_ADDR_CLAIM_PROTOCOL);
+ j1939_bus,
+ J1939_ADDR_CLAIM_PROTOCOL);
+
if(ret < 0)
{
AFB_ERROR("Error open socket address claiming for j1939 protocol");
return -1;
}
-
-// std::shared_ptr<low_can_subscription_t> saddrclaim = application.get_subscription_address_claiming();
-
add_to_event_loop(low_can_j1939);
break;
}
#endif
if(ret)
- {
AFB_ERROR("There was something wrong with CAN device Initialization.");
- }
return ret;
}
Code Review / apps / agl-service-can-low-level.git / blobdiff