summaryrefslogtreecommitdiffstats
path: root/CAN-binder/low-can-binding
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-06-07 01:28:21 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-06-07 01:28:21 +0200
commit89b22975575deba2aee277ea03867238f963c3aa (patch)
tree1bb8fc857cebe56241a05c53d01d35ae1d092213 /CAN-binder/low-can-binding
parent81fae31aa6881f6d0630da17d5e174d221c6020c (diff)
Fix: c++11 detected and not applied from config
Change-Id: Iedf1f88e142a3f579ada3794b1f0f8813105d880 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding')
-rw-r--r--CAN-binder/low-can-binding/binding/low-can-cb.cpp2
-rw-r--r--CAN-binder/low-can-binding/can/can-bus.hpp2
2 files changed, 3 insertions, 1 deletions
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 071f1076..ce829b98 100644
--- a/CAN-binder/low-can-binding/binding/low-can-cb.cpp
+++ b/CAN-binder/low-can-binding/binding/low-can-cb.cpp
@@ -208,6 +208,8 @@ static int subscribe_unsubscribe_diagnostic_messages(struct afb_req request, boo
}
else
{
+ diag_m.cleanup_request(
+ diag_m.find_recurring_request(*diag_req), true);
if(sig->get_supported())
{DEBUG(binder_interface, "%s: %s cancelled due to unsubscribe", __FUNCTION__, sig->get_name().c_str());}
else
diff --git a/CAN-binder/low-can-binding/can/can-bus.hpp b/CAN-binder/low-can-binding/can/can-bus.hpp
index dd67ca85..99d5a30f 100644
--- a/CAN-binder/low-can-binding/can/can-bus.hpp
+++ b/CAN-binder/low-can-binding/can/can-bus.hpp
@@ -29,7 +29,7 @@
#include "can-message.hpp"
#include "../utils/config-parser.hpp"
#include "../binding/low-can-hat.hpp"
-#include "../binding/low-can-subscription.hpp"
+#include "../binding/low-can-cb.hpp"
// TODO actual max is 32 but dropped to 24 for memory considerations
#define MAX_ACCEPTANCE_FILTERS 24