summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-12-19 21:00:41 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-19 21:01:09 +0100
commite9c3f4476f692680c03a562364496ce8571d4a1c (patch)
tree48f467ef30eb5c30f27abd8ca13a2cbb7bee5f74
parent84031b998b9dbfe11d9223c69e4357676357f871 (diff)
Bulk of small fixes
Correctly grab lua script using simpler prefix Correctly free Composer object's members Adding default binding source as required-apis Change-Id: I91d34b636286e79c7bcc27f8ba2730897ec5f424 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua8
-rw-r--r--conf.d/wgt/config.xml.in2
m---------ctl-utilities0
-rw-r--r--signal-composer-binding/signal-composer.cpp4
4 files changed, 4 insertions, 10 deletions
diff --git a/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua b/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua
index 0295b6d..9d31f25 100644
--- a/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua
+++ b/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua
@@ -75,14 +75,6 @@ function _Simple_Echo_Args (source, args, event)
print ("--inlua-- source=", Dump_Table(source))
print ("--inlua-- args=", Dump_Table(args))
print ("--inlua-- event=", Dump_Table(event))
-
- local response={
- ["count"]=_count,
- ["args"]=args,
- }
-
- -- fulup Embdeded table ToeDone AFB:success (request, response)
- -- AFB:success (request, response)
end
local function Test_Async_CB (request, result, context)
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index 574c388..e72a08e 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -18,6 +18,8 @@
<feature name="urn:AGL:widget:required-api">
<param name="lib/afb-signal-composer.so" value="local" />
+ <param name="low-can" value="ws" />
+ <param name="gps" value="ws" />
</feature>
<feature name="urn:AGL:widget:file-properties">
diff --git a/ctl-utilities b/ctl-utilities
-Subproject 554b5ec5cbe4520abfee59ac0963af7ac1ecfad
+Subproject 958e2d98e37907e565a0cdd12459c5ae4b11887
diff --git a/signal-composer-binding/signal-composer.cpp b/signal-composer-binding/signal-composer.cpp
index 83a2b9f..fa565cb 100644
--- a/signal-composer-binding/signal-composer.cpp
+++ b/signal-composer-binding/signal-composer.cpp
@@ -93,8 +93,8 @@ Composer::~Composer()
{
json_object_put(j);
}
- json_object_put(ctlConfig_->configJ);
- json_object_put(ctlConfig_->requireJ);
+ if (ctlConfig_->configJ) json_object_put(ctlConfig_->configJ);
+ if (ctlConfig_->requireJ)json_object_put(ctlConfig_->requireJ);
free(ctlConfig_);
}