LUA lib and bin embedded in project

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

3 files changed, 33 insertions, 23 deletions

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 2c37be7..1776cf9 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -16,7 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-PROJECT_TARGET_ADD(lua2c-interface)
+PROJECT_TARGET_ADD(builtin)
 
 		# Define targets
 		ADD_LIBRARY(${TARGET_NAME} MODULE ${TARGET_NAME}.cpp)
@@ -31,7 +31,6 @@ PROJECT_TARGET_ADD(lua2c-interface)
 
 		# Library dependencies (include updates automatically)
 		TARGET_LINK_LIBRARIES(${TARGET_NAME}
-			afb-utilities
 			${link_libraries}
 		)
 
@@ -54,7 +53,6 @@ PROJECT_TARGET_ADD(low-can)
 
 	# Library dependencies (include updates automatically)
 	TARGET_LINK_LIBRARIES(${TARGET_NAME}
-		afb-utilities
 		${link_libraries}
 	)
 
@@ -77,7 +75,6 @@ PROJECT_TARGET_ADD(gps)
 
 	# Library dependencies (include updates automatically)
 	TARGET_LINK_LIBRARIES(${TARGET_NAME}
-		afb-utilities
 		${link_libraries}
 	)
 
diff --git a/plugins/lua2c-interface.cpp b/plugins/builtin.cpp
index b584823..e93d929 100644
--- a/plugins/lua2c-interface.cpp
+++ b/plugins/builtin.cpp
@@ -31,18 +31,14 @@ extern "C"
 {
 
 CTLP_LUALOAD
-CTLP_REGISTER("lua2c-interface");
+CTLP_REGISTER("builtin");
 
-typedef struct CtxS {
-	struct signalCBT* pluginHandle;
-} CtxT;
-
-static CtxT *pluginCtx = NULL;
+static struct signalCBT* pluginCtx = NULL;
 
 // Call at initialisation time
 CTLP_ONLOAD(plugin, handle) {
-	pluginCtx = (CtxT*)calloc (1, sizeof(CtxT));
-	pluginCtx->pluginHandle = (struct signalCBT*)handle;
+	pluginCtx = (struct signalCBT*)calloc (1, sizeof(struct signalCBT));
+	pluginCtx = (struct signalCBT*)handle;
 
 	AFB_NOTICE ("Low-can plugin: label='%s' version='%s' info='%s'",
 		plugin->label,
@@ -52,6 +48,28 @@ CTLP_ONLOAD(plugin, handle) {
 	return (void*)pluginCtx;
 }
 
+CTLP_CAPI (defaultOnReceived, source, argsJ, eventJ, context)
+{
+	struct signalCBT* ctx = (struct signalCBT*)source->context;
+	AFB_NOTICE("source: %s argj: %s, eventJ %s", source->label,
+		json_object_to_json_string(argsJ),
+		json_object_to_json_string(eventJ));
+	void* sig = ctx->aSignal;
+
+	json_object* valueJ = nullptr;
+	json_object* timestampJ = nullptr;
+	double value = 0;
+	uint64_t timestamp = 0;
+	if(json_object_object_get_ex(eventJ, "value", &valueJ))
+		{value = json_object_get_double(valueJ);}
+	if(json_object_object_get_ex(eventJ, "timestamp", &timestampJ))
+		{timestamp = json_object_get_int64(timestampJ);}
+
+	struct signalValue v = value;
+	ctx->setSignalValue(sig, timestamp, v);
+	return 0;
+}
+
 CTLP_LUA2C (setSignalValueWrap, label, argsJ)
 {
 	const char* name = nullptr;
@@ -65,8 +83,8 @@ CTLP_LUA2C (setSignalValueWrap, label, argsJ)
 		AFB_ERROR("Fail to set value for label: %s, argsJ: %s", label, json_object_to_json_string(argsJ));
 		return -1;
 	}
-	struct signalValue result = {0,0,1, resultNum, 0, ""};
-	pluginCtx->pluginHandle->setSignalValue(name, timestamp*MICRO, result);
+	struct signalValue result = resultNum;
+	pluginCtx->searchNsetSignalValue(name, timestamp*MICRO, result);
 	return 0;
 }
 
diff --git a/plugins/low-can.cpp b/plugins/low-can.cpp
index 18138b5..a425296 100644
--- a/plugins/low-can.cpp
+++ b/plugins/low-can.cpp
@@ -141,29 +141,24 @@ CTLP_CAPI (isOpen, source, argsJ, eventJ, context) {
 		return -1;
 	}
 
-	struct signalValue value = {
-		.hasBool = true, .boolVal = eventStatus,
-		.hasNum = false, .numVal = 0,
-		.hasStr = false, .strVal = std::string()
-	};
 	if(strcasestr(eventName, "front_left"))
 	{
-		pluginCtx->pluginHandle->setSignalValue(eventName,(uint64_t)timestamp, value);
+		pluginCtx->pluginHandle->searchNsetSignalValue(eventName,(uint64_t)timestamp, eventStatus);
 		setDoor(&pluginCtx->allDoorsCtx.front_left, eventName, eventStatus);
 	}
 	else if(strcasestr(eventName, "front_right"))
 	{
-		pluginCtx->pluginHandle->setSignalValue(eventName,(uint64_t)timestamp, value);
+		pluginCtx->pluginHandle->searchNsetSignalValue(eventName,(uint64_t)timestamp, eventStatus);
 		setDoor(&pluginCtx->allDoorsCtx.front_right, eventName, eventStatus);
 	}
 	else if(strcasestr(eventName, "rear_left"))
 	{
-		pluginCtx->pluginHandle->setSignalValue(eventName,(uint64_t)timestamp, value);
+		pluginCtx->pluginHandle->searchNsetSignalValue(eventName,(uint64_t)timestamp, eventStatus);
 		setDoor(&pluginCtx->allDoorsCtx.rear_left, eventName, eventStatus);
 	}
 	else if(strcasestr(eventName, "rear_right"))
 	{
-		pluginCtx->pluginHandle->setSignalValue(eventName,(uint64_t)timestamp, value);
+		pluginCtx->pluginHandle->searchNsetSignalValue(eventName,(uint64_t)timestamp, eventStatus);
 		setDoor(&pluginCtx->allDoorsCtx.rear_right, eventName, eventStatus);
 	}
 	else