LUA lib and bin embedded in project

Change-Id: I1a61b49f55e4daa305800e754a14b6041aa81b34
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

9 files changed, 47 insertions, 14 deletions

diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake
index 2ce0ad3..8f93e17 100644
--- a/conf.d/cmake/00-debian-osconfig.cmake
+++ b/conf.d/cmake/00-debian-osconfig.cmake
@@ -1 +1 @@
-list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3)
+#list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3)
diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake
index a2b9325..7a4f5b2 100644
--- a/conf.d/cmake/00-default-osconfig.cmake
+++ b/conf.d/cmake/00-default-osconfig.cmake
@@ -1 +1 @@
-list(APPEND PKG_REQUIRED_LIST lua>=5.3)
+#list(APPEND PKG_REQUIRED_LIST lua>=5.3)
diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake
index 8c8303b..342d1df 100644
--- a/conf.d/cmake/00-suse-config.cmake
+++ b/conf.d/cmake/00-suse-config.cmake
@@ -1,2 +1,2 @@
 add_definitions(-DSUSE_LUA_INCDIR)
-list(APPEND PKG_REQUIRED_LIST lua>=5.3)
+#list(APPEND PKG_REQUIRED_LIST lua>=5.3)
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 08f4cb0..86831e8 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -84,6 +84,7 @@ set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
 # Customize link option
 # -----------------------------
 #list(APPEND link_libraries -an-option)
+list(APPEND link_libraries afb-utilities lua-lib)
 
 # Compilation options definition
 # Use CMake generator expressions to specify only for a specific language
@@ -162,7 +163,7 @@ set(WIDGET_TYPE application/vnd.agl.service)
 # This is the file that will be executed, loaded,
 # at launch time by the application framework.
 #
-set(WIDGET_ENTRY_POINT lib/afb-signals-composer.so)
+set(WIDGET_ENTRY_POINT afb/afb-signal-composer.so)
 
 # Optional dependencies order
 # ---------------------------
diff --git a/conf.d/project/etc/init-daemon.json b/conf.d/project/etc/init-daemon.json
index 635b697..045f3fe 100644
--- a/conf.d/project/etc/init-daemon.json
+++ b/conf.d/project/etc/init-daemon.json
@@ -20,13 +20,6 @@
 			"version": "1.0",
 			"info": "Manage interaction with gps service",
 			"basename": "gps"
-		},
-		{
-			"label": "lua2c",
-			"version": "1.0",
-			"info": "Lua2C Interface",
-			"basename": "lua2c-interface",
-			"lua2c": ["setSignalValueWrap"]
 		}
 	]
 }
diff --git a/conf.d/project/etc/sig-demoboard.json b/conf.d/project/etc/sig-demoboard.json
index 3b82bfe..1bccbff 100644
--- a/conf.d/project/etc/sig-demoboard.json
+++ b/conf.d/project/etc/sig-demoboard.json
@@ -23,7 +23,10 @@
 			"event": "low-can/diagnostic_messages.engine.speed",
 			"retention": 30,
 			"unit": "rpm",
-			"frequency": 1
+			"frequency": 1,
+			"onReceived": {
+				"function": "builtin://defaultOnReceived"
+			}
 		},
 		{
 			"id": "fuel_level",
diff --git a/conf.d/project/lua.d/init-daemon-04-oncall.lua b/conf.d/project/lua.d/init-daemon-04-oncall.lua
index 7dc4669..71df908 100644
--- a/conf.d/project/lua.d/init-daemon-04-oncall.lua
+++ b/conf.d/project/lua.d/init-daemon-04-oncall.lua
@@ -42,6 +42,8 @@ function _Unit_Converter(source, args, event)
   local sourcei, targeti = _positions[sourceunits], _positions[targetunits]
   assert(sourcei and targeti)
 
+  print(event['timestamp'])
+
   if sourcei<targeti then
 
     local base=1
@@ -51,7 +53,7 @@ function _Unit_Converter(source, args, event)
 
     event["value"] = value/base
 
-    lua2c["setSignalValueWrap"](source, event)
+    lua2c["luaSet"](source, event)
 
   elseif sourcei>targeti then
 
@@ -62,7 +64,7 @@ function _Unit_Converter(source, args, event)
 
     event["value"] = value/base
 
-    lua2c["setSignalValueWrap"](source, event)
+    lua2c["luaSet"](source, event)
 
   else
     print("No conversion")
diff --git a/conf.d/wgt/config.xml b/conf.d/wgt/config.xml
new file mode 100644
index 0000000..c4cfe62
--- /dev/null
+++ b/conf.d/wgt/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
+	<name>@PROJECT_NAME@</name>
+	<icon src="@PROJECT_ICON@"/>
+	<content src="@WIDGET_ENTRY_POINT@" type="@WIDGET_TYPE@"/>
+	<description>@PROJECT_DESCRIPTION@</description>
+	<author>@PROJECT_AUTHOR@ &lt;@PROJECT_AUTHOR_MAIL@&gt;</author>
+	<license>@PROJECT_LICENSE@</license>
+
+	<feature name="urn:AGL:widget:required-permission">
+		<param name="urn:AGL:permission::public:hidden" value="required" />
+		<param name="urn:AGL:permission::public:no-htdocs" value="required" />
+	</feature>
+
+	<feature name="urn:AGL:widget:provided-api">
+		<param name="signal-composer" value="ws" />
+	</feature>
+
+	<feature name="urn:AGL:widget:required-api">
+		<param name="afb/afb-signal-composer.so" value="local" />
+	</feature>
+</widget>
diff --git a/conf.d/xds/xds-config.env b/conf.d/xds/xds-config.env
new file mode 100644
index 0000000..cc815f6
--- /dev/null
+++ b/conf.d/xds/xds-config.env
@@ -0,0 +1,12 @@
+XDS_PROJECT_ID="e01dbc0a-a81b-11e7-af36-90b11c6bb221_Project_afb-signal-c"
+XDS_SDK_ID="poky-agl_aarch64_4.90.0+snapshot"
+
+XDS_SERVER_URL=localhost:8000
+
+#DOCKER_TARGET=agl-xds-shamash-0-claneys
+PATH=/opt/bin:/opt/AGL/bin:/usr/lib64/ccache:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/home/claneys/.local/bin:/home/claneys/bin
+
+RSYNC_TARGET=root@sataran.uruk.home
+RSYNC_PREFIX=/tmp
+PROJECT_DIR=/home/claneys/Workspace/Sources/IOTbzh/afb-signal-composer
+