From 78202d5bd8a8d09a55bb71b9df6d3f54b18184b8 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 20 Sep 2017 16:54:14 +0200 Subject: Make LUA works - Added LUA library at link - Make app-template crash build if a checked file fails - Fix old defined variable CONTROL_LUA_PATH to a default one in the binding data directory - Add an example with unit conversion made in LUA Change-Id: I1b4712bde32a38044ad6b14ebd38b6782fd01fe9 Signed-off-by: Romain Forlot --- signal-composer-binding/signal-composer.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'signal-composer-binding/signal-composer.cpp') diff --git a/signal-composer-binding/signal-composer.cpp b/signal-composer-binding/signal-composer.cpp index 151de6c..2e4f221 100644 --- a/signal-composer-binding/signal-composer.cpp +++ b/signal-composer-binding/signal-composer.cpp @@ -84,6 +84,15 @@ SourceAPI* bindingApp::getSourceAPI(const std::string& api) } return nullptr; } +int bindingApp::initSourcesAPI() +{ + int err = 0; + for(auto& src: sourcesListV_) + { + err += src.init(); + } + return err; +} std::vector bindingApp::parseURI(const std::string& uri) { @@ -123,7 +132,7 @@ CtlActionT* bindingApp::convert2Action(const std::string& name, json_object* act std::string fName = std::string(function).substr(6); wrap_json_pack(&action, "{ss,ss,so*}", "label", name.c_str(), - "lua", fName, + "lua", fName.c_str(), "args", functionArgsJ); } else if(startsWith(function, "api://")) @@ -205,13 +214,13 @@ int bindingApp::loadSourcesAPI(CtlSectionT* section, json_object *sourcesJ) { int err = 0; bindingApp& bApp = instance(); - json_object *sigCompJ = nullptr; - // add the signal composer itself as source if(sourcesJ) { + json_object *sigCompJ = nullptr; + // add the signal composer itself as source wrap_json_pack(&sigCompJ, "{ss,ss}", - "api", "signal-composer", + "api", afbBindingV2.api, "info", "Api on behalf the virtual signals are sent"); json_object_array_add(sourcesJ, sigCompJ); @@ -232,7 +241,9 @@ int bindingApp::loadSourcesAPI(CtlSectionT* section, json_object *sourcesJ) if ((err = bApp.loadOneSourceAPI(sourcesJ))) return err; if (sigCompJ && (err = bApp.loadOneSourceAPI(sigCompJ))) return err; } -} + } + else + {err += bindingApp::instance().initSourcesAPI();} return err; } -- cgit 1.2.3-korg