summaryrefslogtreecommitdiffstats
path: root/conf.d/project/etc
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-07-04 18:18:43 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-07-05 16:22:47 +0200
commit64fcae698a48acf6bd7f05d168b5cd4badcf0bd3 (patch)
tree360d22bf5fe8584cafd22acaa93bcf76a3a09440 /conf.d/project/etc
parentbf964e8ad085cd051d9a28bcd74aafeeb08c9593 (diff)
Update submodules
Submodule conf.d/app-templates 6e1a3c3..aa68dbd: > Don't overwrite the autobuild script if it exists > Disable the in-tree build method. > Detect Yocto as OS distribution > Fix: wrong compile options added > Fallback using zip format if no wgtpkg-pack found > 02-variables.cmake: Avoid checking CXX version if not required > config.cmake.sample: Remove dependency to libsystemd > config.cmake.sample: Remove dependency to libmicrohttpd > Added -D_FORTIFY_SOURCE=2 to CFLAGS > start-on-target: uses RSYNC_PREFIX path for config > Fixed spelling. > Improve OS detection > Fix: OS detection > Launch from workdir > Change closing that could fix native debugging Submodule ctl-utilities 0129510...1ff524b: > Change LUA package path at LUA interpreter load > Don't load two times a plugin even for LUA > Fixed hidden bound variable (apiHandle) > Fixed null value when push Lua arguments > Adjust to compile with incoming bindings v3 > Remove declaration to not existing functions > Add 2 lua utilities function > Update README.md for new metadata keys. > Fix a compilation issue due to modif of AFB_ReqSuccess > README:md: update README accordingly to new json scheme. > Fixed crash due to call to json_object_put > Fix segfault when printing long message from lua > Fixed spelling of AFB_ReqSuccess > Remove an unnecessary variable > Make parsing of action loading non blocking > Use an external file for app fw functions link > Use macro to test request validity > Fixed build warnings with gcc >= 7.3 > Increase lua script max message size > Prevent lost of config file path when searching > Correct way that api actions are handled in controller > Handle more metadata in the controller. > Add possibility to set prefix to NULL in CtlConfigScan > Fixed compilation warnings with gcc-7.2.0 > Add an external field to CtlConfigT > Make action item from a LUA action mandatory > Handle no prefix given > Good usage of strncat and strncpy > Update to the new JSON syntax > Detect failure at OnLoad action calls > Improve reliability and function calls > Correctly release request JSON object > Add AFB macros > Don't use assert in controller. > Change lua2c JSON syntax. > Search for Event section > Fix: changes key name. > Fix: arguments pointer NULL check > Fix wrong error message. > Simplify action definition > Fix: Dyn API Action loading procedure > Use new version of function GetBindingDirPath > Format > Merge changes from topic 'sandbox/claneys/wip' > Upgrade config schema > Fix: callback execution condition < Format < Fix: callback execution condition < New action loading function. < Upgrade config schema Adapt json config file to new syntax Fix: prefix now add the "-" so it'isn't needed to add it in the prefix at search (signal-composer.cpp) Fix: calling a api verb without json_object fails because of config arguments not retrieved. (sources.cpp) Change-Id: I48c1bca9fbac485e6a34b4645e683d9bdb1cbf2b Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d/project/etc')
-rw-r--r--conf.d/project/etc/control-basic-conf.json6
-rw-r--r--conf.d/project/etc/control-signal-composer.json3
-rw-r--r--conf.d/project/etc/sig-txc.json6
-rw-r--r--conf.d/project/etc/sources-txc.json6
4 files changed, 8 insertions, 13 deletions
diff --git a/conf.d/project/etc/control-basic-conf.json b/conf.d/project/etc/control-basic-conf.json
index dd7255f..1331544 100644
--- a/conf.d/project/etc/control-basic-conf.json
+++ b/conf.d/project/etc/control-basic-conf.json
@@ -11,18 +11,18 @@
{
"uid": "low-can-callbacks",
"info": "Manage interaction with low-can service",
- "basename": "low-can"
+ "libs": "low-can.ctlso"
},
{
"uid": "gps-callbacks",
"info": "Manage interaction with gps service",
- "basename": "gps"
+ "libs": "gps.ctlso"
},
{
"uid": "convert",
"info": "LUA fonctions used to convert standard unit.",
"spath": "/tmp",
- "file": "unit-conversion.lua"
+ "libs": "unit-conversion.lua"
}
],
"signals": {
diff --git a/conf.d/project/etc/control-signal-composer.json b/conf.d/project/etc/control-signal-composer.json
index 1734422..3e693f6 100644
--- a/conf.d/project/etc/control-signal-composer.json
+++ b/conf.d/project/etc/control-signal-composer.json
@@ -22,8 +22,7 @@
"uid": "builtin",
"info": "Builtin routine for onReceived or getSignals routines",
"libs": "builtin.ctlso",
- "lua2c": "setSignalValueWrap",
- "lua2c_prefix": "bui"
+ "lua": { "prefix": "composer", "functions": "setSignalValueWrap"}
}
],
"signals": {
diff --git a/conf.d/project/etc/sig-txc.json b/conf.d/project/etc/sig-txc.json
index 9599cce..c9c59cd 100644
--- a/conf.d/project/etc/sig-txc.json
+++ b/conf.d/project/etc/sig-txc.json
@@ -10,8 +10,7 @@
"event": "vehicle_speed"
},
"onReceived": {
- "uri": "lua://convert",
- "function": "_Unit_Converter",
+ "action": "lua://convert#_Unit_Converter",
"args": {
"from": "km/h",
"to": "mi/h"
@@ -104,8 +103,7 @@
"retention": 30,
"unit": "degrees",
"onReceived": {
- "uri": "plugin://gps-callbacks",
- "function": "getHeading"
+ "action": "plugin://gps-callbacks#getHeading"
}
}
]
diff --git a/conf.d/project/etc/sources-txc.json b/conf.d/project/etc/sources-txc.json
index 77bc99b..a460fee 100644
--- a/conf.d/project/etc/sources-txc.json
+++ b/conf.d/project/etc/sources-txc.json
@@ -6,13 +6,11 @@
"api": "txc",
"info": "Use TXC demo binding as signals provider",
"init": {
- "uri": "api://txc",
- "function": "start",
+ "action": "api://txc#start",
"args": {"filename": "var/nyc-downtown-crosstown.json"}
},
"getSignals": {
- "uri": "api://txc",
- "function": "subscribe"
+ "action": "api://txc#subscribe"
}
}
]