From 8df3e437f941912067231250ff5695b8a3a7fd92 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 5 Oct 2017 01:38:18 +0200 Subject: LUA lib and bin embedded in project Change-Id: I1a61b49f55e4daa305800e754a14b6041aa81b34 Signed-off-by: Romain Forlot --- plugins/CMakeLists.txt | 5 +-- plugins/builtin.cpp | 92 +++++++++++++++++++++++++++++++++++++++++++++ plugins/low-can.cpp | 13 ++----- plugins/lua2c-interface.cpp | 74 ------------------------------------ 4 files changed, 97 insertions(+), 87 deletions(-) create mode 100644 plugins/builtin.cpp delete mode 100644 plugins/lua2c-interface.cpp (limited to 'plugins') 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/builtin.cpp b/plugins/builtin.cpp new file mode 100644 index 0000000..e93d929 --- /dev/null +++ b/plugins/builtin.cpp @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2016 "IoT.bzh" + * Author Romain Forlot + * + * 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 AFB_BINDING_VERSION 2 +#include +#include +#include +#include +#include + +#include "signal-composer.hpp" +#include "ctl-config.h" +#include "wrap-json.h" + +extern "C" +{ + +CTLP_LUALOAD +CTLP_REGISTER("builtin"); + +static struct signalCBT* pluginCtx = NULL; + +// Call at initialisation time +CTLP_ONLOAD(plugin, 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, + plugin->version, + plugin->info); + + 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", ×tampJ)) + {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; + double resultNum; + uint64_t timestamp; + if(! wrap_json_unpack(argsJ, "{ss, sF, sI? !}", + "name", &name, + "value", &resultNum, + "timestamp", ×tamp)) + { + AFB_ERROR("Fail to set value for label: %s, argsJ: %s", label, json_object_to_json_string(argsJ)); + return -1; + } + struct signalValue result = resultNum; + pluginCtx->searchNsetSignalValue(name, timestamp*MICRO, result); + return 0; +} + +// extern "C" closure +} 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 diff --git a/plugins/lua2c-interface.cpp b/plugins/lua2c-interface.cpp deleted file mode 100644 index b584823..0000000 --- a/plugins/lua2c-interface.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2016 "IoT.bzh" - * Author Romain Forlot - * - * 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 AFB_BINDING_VERSION 2 -#include -#include -#include -#include -#include - -#include "signal-composer.hpp" -#include "ctl-config.h" -#include "wrap-json.h" - -extern "C" -{ - -CTLP_LUALOAD -CTLP_REGISTER("lua2c-interface"); - -typedef struct CtxS { - struct signalCBT* pluginHandle; -} CtxT; - -static CtxT *pluginCtx = NULL; - -// Call at initialisation time -CTLP_ONLOAD(plugin, handle) { - pluginCtx = (CtxT*)calloc (1, sizeof(CtxT)); - pluginCtx->pluginHandle = (struct signalCBT*)handle; - - AFB_NOTICE ("Low-can plugin: label='%s' version='%s' info='%s'", - plugin->label, - plugin->version, - plugin->info); - - return (void*)pluginCtx; -} - -CTLP_LUA2C (setSignalValueWrap, label, argsJ) -{ - const char* name = nullptr; - double resultNum; - uint64_t timestamp; - if(! wrap_json_unpack(argsJ, "{ss, sF, sI? !}", - "name", &name, - "value", &resultNum, - "timestamp", ×tamp)) - { - 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); - return 0; -} - -// extern "C" closure -} -- cgit 1.2.3-korg