aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Guyader <arthur.guyader@iot.bzh>2019-05-24 12:16:57 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2019-06-26 18:06:54 +0200
commit0ccfb70f9122ea73ff198f3000cf11be12bcc9d2 (patch)
treee184d62322c7322ff7892ca5a09ca8af827c6bda
parent2f60d294b3fa4e243fa67a738f9b82a0b428a7fc (diff)
Add the possibility to subscribe an id or a pgn
The commit allows at the time of subscription to do: -> low-can subscribe {"id": 48} -> low-can subscribe {"pgn": 61442} The generation of event_filter has been extracted in a separate function. Bug-AGL: SPEC-2386 Change-Id: I592e668c63be448562b27c81fcdc111cd34f3676 Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh> Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh> Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--low-can-binding/binding/application.cpp19
-rw-r--r--low-can-binding/binding/application.hpp2
-rw-r--r--low-can-binding/binding/low-can-cb.cpp107
3 files changed, 106 insertions, 22 deletions
diff --git a/low-can-binding/binding/application.cpp b/low-can-binding/binding/application.cpp
index 5e0a6537..f0f008c5 100644
--- a/low-can-binding/binding/application.cpp
+++ b/low-can-binding/binding/application.cpp
@@ -62,7 +62,7 @@ std::vector<std::shared_ptr<signal_t> > application_t::get_all_signals()
return message_set_[active_message_set_]->get_all_signals();
}
-std::vector<std::shared_ptr<diagnostic_message_t> > application_t::get_diagnostic_messages()
+std::vector<std::shared_ptr<diagnostic_message_t>> application_t::get_diagnostic_messages()
{
return message_set_[active_message_set_]->get_diagnostic_messages();
}
@@ -72,6 +72,23 @@ std::vector<std::shared_ptr<message_definition_t>> application_t::get_messages_d
return message_set_[active_message_set_]->get_messages_definition();
}
+
+std::shared_ptr<message_definition_t> application_t::get_message_definition(uint32_t id)
+{
+ std::shared_ptr<message_definition_t> ret = nullptr;
+ std::vector<std::shared_ptr<message_definition_t>> messages_definition = get_messages_definition();
+ for(std::shared_ptr<message_definition_t> &msg_def : messages_definition)
+ {
+ if(msg_def->get_id() == id)
+ {
+ ret = msg_def;
+ break;
+ }
+ }
+ return ret;
+}
+
+
uint32_t application_t::get_signal_id(diagnostic_message_t& sig) const
{
return sig.get_pid();
diff --git a/low-can-binding/binding/application.hpp b/low-can-binding/binding/application.hpp
index f56900a7..b73ace71 100644
--- a/low-can-binding/binding/application.hpp
+++ b/low-can-binding/binding/application.hpp
@@ -74,6 +74,8 @@ class application_t
std::vector<std::shared_ptr<message_definition_t> > get_messages_definition();
+ std::shared_ptr<message_definition_t> get_message_definition(uint32_t id);
+
uint32_t get_signal_id(diagnostic_message_t& sig) const;
uint32_t get_signal_id(signal_t& sig) const;
diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index 8edd1daa..ab6210bf 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -256,7 +256,7 @@ static int subscribe_unsubscribe_signals(afb_req_t request,
{can_subscription = it->second;}
else
{
- can_subscription = std::make_shared<low_can_subscription_t>(low_can_subscription_t(event_filter));
+ 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;}
if(add_to_event_loop(can_subscription) < 0)
@@ -298,17 +298,12 @@ static int subscribe_unsubscribe_signals(afb_req_t request,
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,6 +316,14 @@ 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);
@@ -331,31 +334,93 @@ static int one_subscribe_unsubscribe(afb_req_t request,
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_t> 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)
{
- 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(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)
+ {
+ 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;