summaryrefslogtreecommitdiffstats
path: root/conf.d
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-09-10 19:46:02 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-14 11:00:25 +0100
commit75cfbf3d0206f12422091e6479c508c69445bf4a (patch)
tree200085512507e7ee5adc43b377d34ff5953db8de /conf.d
parentbdf2d19cf8a3d6005456508ca52dba74cd9c103f (diff)
Controller src integration
Change-Id: I0b18cd55057a784d183a5ba02c332810a34d1fca Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d')
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake5
-rw-r--r--conf.d/project/etc/sig-sources.json33
3 files changed, 21 insertions, 17 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject e9a682f1c694eec242c3cebccc09380f621ade0
+Subproject b05e4422c52fe1e80c9552f2057c8c817c4d2fe
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index d57f225..d2f31ae 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -77,7 +77,7 @@ set (PKG_REQUIRED_LIST
# Prefix path where will be installed the files
# Default: /usr/local (need root permission to write in)
# ------------------------------------------------------
-#set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
# Customize link option
# -----------------------------
@@ -125,6 +125,9 @@ set (PKG_REQUIRED_LIST
# -O2
# CACHE STRING "Compilation flags for RELEASE build type.")
+add_definitions("-DCONTROL_CONFIG_PRE=\"init\"")
+add_definitions("-DCTL_PLUGIN_MAGIC=3286576532")
+
# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
# ---------------------------------------------------------------------
set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
diff --git a/conf.d/project/etc/sig-sources.json b/conf.d/project/etc/sig-sources.json
index 95de2fa..6051e3e 100644
--- a/conf.d/project/etc/sig-sources.json
+++ b/conf.d/project/etc/sig-sources.json
@@ -10,50 +10,51 @@
{
"api": "low-can",
"info": "Low level binding to handle CAN bus communications",
- "init": {
+ "actions": [{
+ "label": "init",
"function": "c/lua (depend on name) function to initialize binding",
"args": {
"arg": "first argument"
}
- },
- "get_signal": {
+ }, {
+ "label": "getSignal",
"function": "c/lua (depend on name) function to get signals",
"args": {
"arg": "first argument"
}
- }
- },
- {
+ }]
+ }, {
"api": "gps",
"info": "Low level binding which retrieve Satellite positionning values",
- "init": {
+ "actions": [{
+ "label": "init",
"function": "c/lua (depend on name) function to initialize binding",
"args": {
"arg": "first argument"
}
- },
- "get_signal": {
+ }, {
+ "label": "getSignal",
"function": "c/lua (depend on name) function to get signals",
"args": {
"arg": "first argument"
}
- }
- },
- {
+ }]
+ }, {
"api": "mraa",
"info": "Low level binding which retrieve different values from several sensors like gyroscope, accelerometer, etc",
- "init": {
+ "actions": [{
+ "label": "init",
"function": "c/lua (depend on name) function to initialize binding",
"args": {
"arg": "first argument"
}
- },
- "get_signal": {
+ }, {
+ "label": "getSignal",
"function": "c/lua (depend on name) function to get signals",
"args": {
"arg": "first argument"
}
- }
+ }]
}
]
}