From f4fba8a2744991ff8c5cb8af4a67c7d9456f1057 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 19 Sep 2017 01:17:28 +0200
Subject: Modification about conf definition

- Argument for each signal subscription. (getSignalsArgs)
- differentiation between Signal as raw signal from another API
 and virtual signal depending upon other signals
- changing way to specify function with uri that specify everythings
 that could be needed to invoke a function.

Change-Id: I8917c5ae3c2c1e3fa48ddfdda41fc75eaba32bb7
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 conf.d/project/etc/sig-doors.json | 65 ++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 39 deletions(-)

(limited to 'conf.d/project/etc/sig-doors.json')

diff --git a/conf.d/project/etc/sig-doors.json b/conf.d/project/etc/sig-doors.json
index ea191e4..1d23f9a 100644
--- a/conf.d/project/etc/sig-doors.json
+++ b/conf.d/project/etc/sig-doors.json
@@ -2,10 +2,9 @@
 	"signals": [
 		{
 			"id": "rear_left_window",
-			"source": "low-can/messages.windows.rear_left.open",
+			"event": "low-can/messages.windows.rear_left.open",
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -13,10 +12,9 @@
 		},
 		{
 			"id": "rear_left_door",
-			"source": "low-can/messages.doors.rear_left.open",
+			"event": "low-can/messages.doors.rear_left.open",
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -24,10 +22,9 @@
 		},
 		{
 			"id": "rear_right_window",
-			"source": "low-can/messages.windows.rear_right.open",
+			"event": "low-can/messages.windows.rear_right.open",
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -35,10 +32,9 @@
 		},
 		{
 			"id": "rear_right_door",
-			"source": "low-can/messages.doors.rear_right.open",
+			"event": "low-can/messages.doors.rear_right.open",
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -46,10 +42,9 @@
 		},
 		{
 			"id": "front_left_window",
-			"source": "low-can/messages.windows.front_left.open",
+			"event": "low-can/messages.windows.front_left.open",
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -57,10 +52,9 @@
 		},
 		{
 			"id": "front_left_door",
-			"source": "low-can/messages.doors.front_left.open",
+			"event": "low-can/messages.doors.front_left.open",
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -68,10 +62,9 @@
 		},
 		{
 			"id": "front_right_window",
-			"source": "low-can/messages.windows.front_right.open",
+			"event": "low-can/messages.windows.front_right.open",
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -79,10 +72,9 @@
 		},
 		{
 			"id": "front_right_door",
-			"source": "low-can/messages.doors.front_right.open",
+			"event": "low-can/messages.doors.front_right.open",
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -90,13 +82,12 @@
 		},
 		{
 			"id": "rear_left",
-			"source": [
+			"depends": [
 				"rear_left_window",
 				"rear_left_door"
 			],
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"ojoi": "pok"
 				}
@@ -104,43 +95,40 @@
 		},
 		{
 			"id": "rear_right",
-			"source": [
+			"depends": [
 				"rear_right_door",
 				"rear_right_window"
 			],
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {}
 			}
 		},
 		{
 			"id": "front_left",
-			"source": [
+			"depends": [
 				"front_left_door",
 				"front_left_window"
 			],
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {}
 			}
 		},
 		{
 			"id": "front_right",
-			"source": [
+			"depends": [
 				"front_right_door",
 				"front_right_window"
 			],
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {}
 			}
 		},
 		{
 			"id": "all_doors",
-			"source": [
+			"depends": [
 				"front_left_door",
 				"front_left_window",
 				"front_right_door",
@@ -151,8 +139,7 @@
 				"rear_right_window"
 			],
 			"onReceived": {
-				"plugin": "low-can-callbacks",
-				"function": "isOpen",
+				"function": "plugin://low-can-callbacks/isOpen",
 				"args": {
 					"evtname": "doors.open"
 				}
-- 
cgit 1.2.3-korg