From b9dd9b46d25f106694528722d63fdc1611d31afd Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 21 Sep 2017 18:16:21 +0200
Subject: Make compile LUA2C functions, binding not working
Change-Id: I37e66929e3ebf464802f9b89a222743936862029
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
conf.d/cmake/config.cmake | 1 +
conf.d/cmake/low-can.c | 157 -------------------------
conf.d/project/etc/init-daemon.json | 7 ++
conf.d/project/etc/sig-demoboard.json | 2 +-
conf.d/project/lua.d/init-daemon-04-oncall.lua | 7 ++
controller/ctl-lua.h | 4 +-
plugins/lua2c-interface.c | 5 +-
7 files changed, 20 insertions(+), 163 deletions(-)
delete mode 100644 conf.d/cmake/low-can.c
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 4f2cf71..36e0b58 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -72,6 +72,7 @@ set (PKG_REQUIRED_LIST
libsystemd>=222
afb-daemon
libmicrohttpd>=0.9.55
+ uuid
)
# Prefix path where will be installed the files
diff --git a/conf.d/cmake/low-can.c b/conf.d/cmake/low-can.c
deleted file mode 100644
index 86f0f5c..0000000
--- a/conf.d/cmake/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", ×tamp);
- 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/conf.d/project/etc/init-daemon.json b/conf.d/project/etc/init-daemon.json
index 045f3fe..a631859 100644
--- a/conf.d/project/etc/init-daemon.json
+++ b/conf.d/project/etc/init-daemon.json
@@ -20,6 +20,13 @@
"version": "1.0",
"info": "Manage interaction with gps service",
"basename": "gps"
+ },
+ {
+ "label": "lua2c",
+ "version": "1.0",
+ "info": "Lua2C Interface",
+ "basename": "lua2c-interface",
+ "lua2c": ["ssetSignalValue"]
}
]
}
diff --git a/conf.d/project/etc/sig-demoboard.json b/conf.d/project/etc/sig-demoboard.json
index 5eb662c..84269d6 100644
--- a/conf.d/project/etc/sig-demoboard.json
+++ b/conf.d/project/etc/sig-demoboard.json
@@ -2,7 +2,7 @@
"signals": [
{
"id": "vehicle_speed",
- "event": "low-can/messages.vehicle.speed",
+ "event": "low-can/messages.vehicle.average.speed",
"class": "temporal",
"unit": "km/h",
"frequency": 1,
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 ae16aa7..d473121 100644
--- a/conf.d/project/lua.d/init-daemon-04-oncall.lua
+++ b/conf.d/project/lua.d/init-daemon-04-oncall.lua
@@ -28,6 +28,7 @@ _interval={
{"m/s",0.27777777777778},
}
+_result = {}
_positions={}
for i=1,3 do
_positions[_interval[i][1]]=i
@@ -51,6 +52,9 @@ function _Unit_Converter(source, args, event)
end
print("Value in", targetunits, "is", value/base)
+ _result["result"] = value/base
+
+ ssetSignalValue(source, _result)
elseif sourcei>targeti then
@@ -60,6 +64,9 @@ function _Unit_Converter(source, args, event)
end
print("Value in ", targetunits, "is", value*base)
+ _result["result"] = value/base
+
+ ssetSignalValue(source, _result)
else
print("No conversion")
diff --git a/controller/ctl-lua.h b/controller/ctl-lua.h
index 2fbebf5..d41c6a5 100644
--- a/controller/ctl-lua.h
+++ b/controller/ctl-lua.h
@@ -63,9 +63,9 @@ typedef int (*Lua2cFunctionT)(char *funcname, json_object *argsJ);
typedef int (*Lua2cWrapperT) (lua_State* luaState, char *funcname, Lua2cFunctionT callback);
#define CTLP_LUALOAD Lua2cWrapperT Lua2cWrap;
-#define CTLP_LUA2C(FuncName, label,argsJ, context) static int FuncName(char*label,json_object*argsJ);\
+#define CTLP_LUA2C(FuncName, label,argsJ) static int FuncName(char*label,json_object*argsJ);\
int lua2c_ ## FuncName(lua_State* luaState){return((*Lua2cWrap)(luaState, MACRO_STR_VALUE(FuncName), FuncName));};\
- static int FuncName(char* label, json_object* argsJ, void* context)
+ static int FuncName(char* label, json_object* argsJ)
typedef enum {
LUA_DOCALL,
diff --git a/plugins/lua2c-interface.c b/plugins/lua2c-interface.c
index d57cfbd..dd69b11 100644
--- a/plugins/lua2c-interface.c
+++ b/plugins/lua2c-interface.c
@@ -47,10 +47,9 @@ CTLP_ONLOAD(plugin, handle) {
return (void*)pluginCtx;
}
-/*
-CTLP_LUA2C (LUAsetSignalValue, label, argsJ, context)
+
+CTLP_LUA2C (ssetSignalValue, label, argsJ)
{
AFB_NOTICE("label: %s, argsJ: %s", label, json_object_to_json_string(argsJ));
return 0;
}
-*/
--
cgit