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 <romain.forlot@iot.bzh>

4 files changed, 82 insertions, 161 deletions

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 9145b57..c0d7225 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -16,6 +16,29 @@
 # limitations under the License.
 ###########################################################################
 
+PROJECT_TARGET_ADD(lua2c-interface)
+
+		# Define targets
+		ADD_LIBRARY(${TARGET_NAME} MODULE ${TARGET_NAME}.c)
+
+		# Alsa Plugin properties
+		SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
+			LABELS "PLUGIN"
+			PREFIX ""
+			SUFFIX ".ctlso"
+			OUTPUT_NAME ${TARGET_NAME}
+		)
+
+		# Library dependencies (include updates automatically)
+		TARGET_LINK_LIBRARIES(${TARGET_NAME}
+			afb-utilities
+			${link_libraries}
+		)
+
+		target_include_directories(${TARGET_NAME}
+		PRIVATE "../controller"
+		PRIVATE "../signal-composer-binding")
+
 PROJECT_TARGET_ADD(low-can)
 
 	# Define targets
@@ -59,5 +82,5 @@ PROJECT_TARGET_ADD(gps)
 	)
 
 	target_include_directories(${TARGET_NAME}
-    PRIVATE "../controller"
-    PRIVATE "../signal-composer-binding")
+	PRIVATE "../controller"
+	PRIVATE "../signal-composer-binding")
diff --git a/plugins/low-can.c b/plugins/low-can.c
deleted file mode 100644
index 86f0f5c..0000000
--- a/plugins/low-can.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2016 "IoT.bzh"
- * Author Romain Forlot <romain.forlot@iot.bzh>
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
-*/
-
-#define _GNU_SOURCE  // needed for vasprintf
-
-#define AFB_BINDING_VERSION 2
-#include <afb/afb-binding.h>
-#include <systemd/sd-event.h>
-#include <json-c/json_object.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "ctl-plugin.h"
-#include "wrap-json.h"
-
-CTLP_REGISTER("low-can");
-
-typedef struct {
-	bool door;
-	bool window;
-} doorT;
-
-typedef struct {
-	doorT* front_left;
-	doorT* front_right;
-	doorT* rear_left;
-	doorT* rear_right;
-} allDoorsCtxT;
-
-// Call at initialisation time
-CTLP_ONLOAD(plugin, api) {
-	allDoorsCtxT *allDoorCtx = (allDoorsCtxT*)calloc (1, sizeof(allDoorsCtxT));
-	memset(allDoorCtx, 0, sizeof(allDoorsCtxT));
-
-	AFB_NOTICE ("Low-can plugin: label='%s' version='%s' info='%s'", plugin->label, plugin->version, plugin->info);
-	return (void*)allDoorCtx;
-}
-
-CTLP_CAPI (subscribeToLow, source, argsJ, eventJ, context) {
-	json_object* signalArrayJ = NULL, *subscribeArgsJ = NULL, *subscribeFilterJ = NULL, *responseJ = NULL;
-	const char* unit = NULL;
-	double frequency = 0;
-	int err = 0;
-
-	err = wrap_json_unpack(eventJ, "{so,s?s,s?F !}",
-		"signal", &signalArrayJ,
-		"unit", &unit,
-		"frequency", &frequency);
-	if(err)
-	{
-		AFB_ERROR("Problem to unpack JSON object eventJ: %s",
-		json_object_to_json_string(eventJ));
-		return err;
-	}
-
-	if(frequency > 0)
-	{
-		wrap_json_pack(&subscribeFilterJ, "{sf}", "frequency", frequency);
-	}
-
-	for (int idx = 0; idx < json_object_array_length(signalArrayJ); idx++)
-	{
-		json_object* aSignalJ = json_object_array_get_idx(signalArrayJ, idx);
-		err = wrap_json_pack(&subscribeArgsJ, "{ss, so*}",
-		"event", json_object_get_string(aSignalJ),
-		"filter", subscribeFilterJ);
-		if(err)
-		{
-			AFB_ERROR("Error building subscription query object");
-			return err;
-		}
-		AFB_DEBUG("Calling subscribe with %s", json_object_to_json_string_ext(subscribeArgsJ, JSON_C_TO_STRING_PRETTY));
-		err = afb_service_call_sync("low-can", "subscribe", subscribeArgsJ, &responseJ);
-		if(err)
-		{
-			AFB_ERROR("Can't find api 'low-can'");
-			return err;
-		}
-	}
-
-	return err;
-}
-
-CTLP_CAPI (isOpen, source, argsJ, eventJ, context) {
-
-	const char* eventName;
-	json_object *eventStatus = NULL;
-	long long int *timestamp = NULL;
-	allDoorsCtxT *ctx=(allDoorsCtxT*)context;
-
-	AFB_DEBUG("Here is the situation: source:%s, args:%s, event:%s,\n fld: %s, flw: %s, frd: %s, frw: %s, rld: %s, rlw: %s, rrd: %s, rrw: %s",
-		source->label,
-		json_object_to_json_string(argsJ),
-		json_object_to_json_string(eventJ),
-		ctx->front_left->door ? "true":"false",
-		ctx->front_left->window ? "true":"false",
-		ctx->front_right->door ? "true":"false",
-		ctx->front_right->window ? "true":"false",
-		ctx->rear_left->door ? "true":"false",
-		ctx->rear_left->window ? "true":"false",
-		ctx->rear_right->door ? "true":"false",
-		ctx->rear_right->window ? "true":"false"
-	);
-
-	int err = wrap_json_unpack(eventJ, "{ss,sb,s?F}",
-		"event", &eventName,
-		"value", &eventStatus,
-		"timestamp", &timestamp);
-	if(err)
-	{
-		AFB_ERROR("Error parsing event %s", json_object_to_json_string(eventJ));
-		return -1;
-	}
-
-	if(strcasestr(eventName, "front_left"))
-	{
-		if(strcasestr(eventName, "door")) {ctx->front_left->door = eventStatus;}
-		else if(strcasestr(eventName, "window")) {ctx->front_left->window = eventStatus;}
-		else {AFB_WARNING("Unexpected behavior, this '%s' is not a door ! ", json_object_to_json_string(eventJ));}
-	}
-	else if(strcasestr(eventName, "front_right"))
-	{
-		if(strcasestr(eventName, "door")) {ctx->front_right->door = eventStatus;}
-		else if(strcasestr(eventName, "window")) {ctx->front_right->window = eventStatus;}
-		else {AFB_WARNING("Unexpected behavior, this '%s' is not a door ! ", json_object_to_json_string(eventJ));}
-	}
-	else if(strcasestr(eventName, "rear_left"))
-	{
-		if(strcasestr(eventName, "door")) {ctx->rear_left->door = eventStatus;}
-		else if(strcasestr(eventName, "window")) {ctx->rear_left->window = eventStatus;}
-		else {AFB_WARNING("Unexpected behavior, this '%s' is not a door ! ", json_object_to_json_string(eventJ));}
-	}
-	else if(strcasestr(eventName, "rear_right"))
-	{
-		if(strcasestr(eventName, "door")) {ctx->rear_right->door = eventStatus;}
-		else if(strcasestr(eventName, "window")) {ctx->rear_right->window = eventStatus;}
-		else {AFB_WARNING("Unexpected behavior, this '%s' is not a door ! ", json_object_to_json_string(eventJ));}
-	}
-	else {AFB_WARNING("Unexpected behavior, this '%s' is not a door ! ", json_object_to_json_string(eventJ));}
-
-	return 0;
-}
diff --git a/plugins/low-can.cpp b/plugins/low-can.cpp
index 8b573ba..7fc5020 100644
--- a/plugins/low-can.cpp
+++ b/plugins/low-can.cpp
@@ -26,7 +26,6 @@
 #include "ctl-plugin.h"
 #include "wrap-json.h"
 
-
 #include "signal-composer.hpp"
 
 extern "C"
@@ -115,7 +114,7 @@ CTLP_CAPI (subscribeToLow, source, argsJ, eventJ, context) {
 	err = afb_service_call_sync("low-can", "subscribe", subscribeArgsJ, &responseJ);
 	if(err)
 	{
-		AFB_ERROR("Can't find api 'low-can'");
+		AFB_ERROR("Subscribe to 'low-can/%s' %s", lowEvent.c_str(), json_object_to_json_string(responseJ));
 		return err;
 	}
 
diff --git a/plugins/lua2c-interface.c b/plugins/lua2c-interface.c
new file mode 100644
index 0000000..d57cfbd
--- /dev/null
+++ b/plugins/lua2c-interface.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2016 "IoT.bzh"
+ * Author Romain Forlot <romain.forlot@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+#define _GNU_SOURCE  // needed for vasprintf
+
+#define AFB_BINDING_VERSION 2
+#include <afb/afb-binding.h>
+#include <systemd/sd-event.h>
+#include <json-c/json_object.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "ctl-config.h"
+#include "wrap-json.h"
+
+CTLP_LUALOAD
+CTLP_REGISTER("lua2c-interface");
+
+typedef struct {
+	struct pluginCBT* pluginHandle;
+} lowCANCtxT;
+
+// Call at initialisation time
+CTLP_ONLOAD(plugin, handle) {
+	lowCANCtxT *pluginCtx= (lowCANCtxT*)calloc (1, sizeof(lowCANCtxT));
+	pluginCtx->pluginHandle = (struct pluginCBT*)handle;
+
+	AFB_NOTICE ("Low-can plugin: label='%s' version='%s' info='%s'",
+		plugin->label,
+		plugin->version,
+		plugin->info);
+
+	return (void*)pluginCtx;
+}
+/*
+CTLP_LUA2C (LUAsetSignalValue, label, argsJ, context)
+{
+	AFB_NOTICE("label: %s, argsJ: %s", label, json_object_to_json_string(argsJ));
+	return 0;
+}
+*/