aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-09-17 19:20:40 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-14 11:00:25 +0100
commit12097251ec058b1fa9d9202998c829b27ee5554f (patch)
tree415d2592913bfa0b980232ffbee09d6cfb48fd02 /plugins
parent5bbc6cb56995d23cb8a4eb584ef0161be092da1f (diff)
Get CPP controller plugin works
Context passing variables not working well Change-Id: Ibc67bef353e5cc2e53ef9e5579d106baab92a604 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/CMakeLists.txt72
-rw-r--r--plugins/low-can.c2
-rw-r--r--plugins/low-can.cpp175
3 files changed, 214 insertions, 35 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 2b21228..9145b57 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -7,7 +7,7 @@
# 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
+# 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,
@@ -18,42 +18,46 @@
PROJECT_TARGET_ADD(low-can)
- # Define targets
- ADD_LIBRARY(${TARGET_NAME} MODULE ${TARGET_NAME}.c)
+ # Define targets
+ ADD_LIBRARY(${TARGET_NAME} MODULE ${TARGET_NAME}.cpp)
- # Alsa Plugin properties
- SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
- LABELS "PLUGIN"
- PREFIX ""
- SUFFIX ".ctlso"
- OUTPUT_NAME ${TARGET_NAME}
- )
+ # 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}
- )
+ # Library dependencies (include updates automatically)
+ TARGET_LINK_LIBRARIES(${TARGET_NAME}
+ afb-utilities
+ ${link_libraries}
+ )
- include_directories("../controller")
+ target_include_directories(${TARGET_NAME}
+ PRIVATE "../controller"
+ PRIVATE "../signal-composer-binding")
PROJECT_TARGET_ADD(gps)
- # 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}
- )
-
- include_directories("../controller")
+ # 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")
diff --git a/plugins/low-can.c b/plugins/low-can.c
index 1c2ad74..86f0f5c 100644
--- a/plugins/low-can.c
+++ b/plugins/low-can.c
@@ -68,7 +68,7 @@ CTLP_CAPI (subscribeToLow, source, argsJ, eventJ, context) {
return err;
}
- if(frequency >= 0)
+ if(frequency > 0)
{
wrap_json_pack(&subscribeFilterJ, "{sf}", "frequency", frequency);
}
diff --git a/plugins/low-can.cpp b/plugins/low-can.cpp
new file mode 100644
index 0000000..8479a47
--- /dev/null
+++ b/plugins/low-can.cpp
@@ -0,0 +1,175 @@
+/*
+ * 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 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"
+
+
+#include "signal-composer.hpp"
+
+extern "C"
+{
+
+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;
+
+typedef struct {
+ bindingApp* bApp;
+ allDoorsCtxT allDoorsCtx;
+} lowCANCtxT;
+
+// Call at initialisation time
+CTLP_ONLOAD(plugin, bAppHandle)
+{
+ lowCANCtxT *pluginCtx= (lowCANCtxT*)calloc (1, sizeof(lowCANCtxT));
+ allDoorsCtxT allDoorsCtx = allDoorsCtxT();
+ ::memset(&allDoorsCtx, 0, sizeof(allDoorsCtxT));
+ pluginCtx->allDoorsCtx = allDoorsCtx;
+
+ pluginCtx->bApp = (bindingApp*)bAppHandle;
+
+ AFB_NOTICE ("Low-can plugin: label='%s' version='%s' info='%s'",
+ plugin->label,
+ plugin->version,
+ plugin->info);
+
+ return (void*)pluginCtx;
+}
+
+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;
+ bool eventStatus;
+ double timestamp;
+ lowCANCtxT *pluginCtx=(lowCANCtxT*)context;
+
+ AFB_NOTICE("This 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),
+ pluginCtx->allDoorsCtx.front_left.door ? "true":"false",
+ pluginCtx->allDoorsCtx.front_left.window ? "true":"false",
+ pluginCtx->allDoorsCtx.front_right.door ? "true":"false",
+ pluginCtx->allDoorsCtx.front_right.window ? "true":"false",
+ pluginCtx->allDoorsCtx.rear_left.door ? "true":"false",
+ pluginCtx->allDoorsCtx.rear_left.window ? "true":"false",
+ pluginCtx->allDoorsCtx.rear_right.door ? "true":"false",
+ pluginCtx->allDoorsCtx.rear_right.window ? "true":"false"
+ );
+
+ int err = wrap_json_unpack(eventJ, "{ss,s?b,s?F}",
+ "name", &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")) {pluginCtx->allDoorsCtx.front_left.door = eventStatus;}
+ else if(strcasestr(eventName, "window")) {pluginCtx->allDoorsCtx.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")) {pluginCtx->allDoorsCtx.front_right.door = eventStatus;}
+ else if(strcasestr(eventName, "window")) {pluginCtx->allDoorsCtx.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")) {pluginCtx->allDoorsCtx.rear_left.door = eventStatus;}
+ else if(strcasestr(eventName, "window")) {pluginCtx->allDoorsCtx.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")) {pluginCtx->allDoorsCtx.rear_right.door = eventStatus;}
+ else if(strcasestr(eventName, "window")) {pluginCtx->allDoorsCtx.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;
+}
+}