aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-05 16:02:19 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-11-02 16:12:26 +0100
commit71a57c4c7bf7ee3383cb50ab2add8b7956edc247 (patch)
tree931684a11cd1bc5a6c4f717a32bf1c384c2c74e3
parent32b4b5c0c5e4193dc215898814b6d9ff0c1059b7 (diff)
Update version of app-controller submodule.
Use new function of controller to add actions to sections (avoid compilation errors). Changes of app-controller: (33abde5 - Romain Forlot) Reworked pluginConfig function (8094951 - Romain Forlot) Retrieve plugin list from api rather than a global (871bd64 - Romain Forlot) Add setter/getter for user free defined pointer (f543f05 - Romain Forlot) Pass the plugin to action. (ce07538 - Romain Forlot) Abort if one required API is missing Change-Id: Ic19d72776f00cfe5f8b8fcecff3ab46d42376dda Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
m---------app-controller0
-rw-r--r--plugins/lib/bluetooth/hal-bt.c4
2 files changed, 2 insertions, 2 deletions
diff --git a/app-controller b/app-controller
-Subproject 625ce776e0e9ed869da90659eb988ee32de4cf3
+Subproject 33abde52666af1335571252143d21de5d305ca9
diff --git a/plugins/lib/bluetooth/hal-bt.c b/plugins/lib/bluetooth/hal-bt.c
index 3f38012..e5c73bc 100644
--- a/plugins/lib/bluetooth/hal-bt.c
+++ b/plugins/lib/bluetooth/hal-bt.c
@@ -130,7 +130,7 @@ CTLP_INIT(plugin, callbacks)
return -6;
}
- if(AddActionsToSectionFromPlugin(plugin->api, *ctrlConfig->ctlPlugins, &ctrlConfig->sections[idx], actionsToAdd, 0)) {
+ if(AddActionsToSection(plugin->api, &ctrlConfig->sections[idx], actionsToAdd, 0)) {
AFB_ApiError(plugin->api, "Wasn't able to add '%s' as a new event to %s", json_object_get_string(actionsToAdd), ctrlConfig->sections[idx].key);
json_object_put(actionsToAdd);
return -7;
@@ -151,7 +151,7 @@ CTLP_INIT(plugin, callbacks)
return -8;
}
- if(AddActionsToSectionFromPlugin(plugin->api, *ctrlConfig->ctlPlugins, &ctrlConfig->sections[idx], actionsToAdd, 0)) {
+ if(AddActionsToSection(plugin->api, &ctrlConfig->sections[idx], actionsToAdd, 0)) {
AFB_ApiError(plugin->api, "Wasn't able to add '%s' as a new onload to %s", json_object_get_string(actionsToAdd), ctrlConfig->sections[idx].uid);
json_object_put(actionsToAdd);
return -9;