From eabae24ea592420de46e36f0b1af5d39eee5b8a4 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 14 Sep 2017 19:31:42 +0200
Subject: Attach and recursion check working

Change-Id: I2f9509d4b6aa63a16df8db2187810337fd802ef4
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 conf.d/project/etc/sig-doors.json | 121 +++++++++++++++-----------------------
 1 file changed, 49 insertions(+), 72 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 e93745e..bc26296 100644
--- a/conf.d/project/etc/sig-doors.json
+++ b/conf.d/project/etc/sig-doors.json
@@ -1,83 +1,60 @@
 {
 	"signals": [
 		{
-			"id": "rear_left_windows",
-			"source": "low-can/messages.windows.rear_left.open",
-			"class": "state",
-			"onReceived": {
-				"function": "_Door_opened",
-				"args": {
-					"evtname": "messages.windows.rear_left.open"
-				}
-			}
+			"id": "rear_left_window",
+			"source": "low-can/messages.windows.rear_left.open"
 		},
 		{
 			"id": "rear_left_door",
-			"source": "low-can/messages.doors.rear_left.open",
-			"class": "state",
-			"onReceived": {
-				"function": "_Door_opened",
-				"args": {
-					"evtname": "messages.doors.rear_left.open"
-				}
-			}
+			"source": "low-can/messages.doors.rear_left.open"
 		},
 		{
-			"id": "rear_left",
-			"source": [
-				"rear_left_windows",
-				"rear_left_doors"
-			],
-			"class": "state",
-			"onReceived": {
-				"function": "_Door_opened",
-				"args": {
-					"ojoi": "pok"
-				}
-			}
+			"id": "rear_right_window",
+			"source": "low-can/messages.windows.rear_right.open"
+		},
+		{
+			"id": "rear_right_door",
+			"source": "low-can/messages.doors.rear_right.open"
+		},
+		{
+			"id": "front_left_window",
+			"source": "low-can/messages.windows.front_left.open"
+		},
+		{
+			"id": "front_left_door",
+			"source": "low-can/messages.doors.front_left.open"
 		},
 		{
 			"id": "front_right_window",
-			"source": "low-can/messages.windows.front_right.open",
-			"class": "state",
-			"onReceived": {
-				"function": "_Door_opened",
-				"args": {
-					"evtname": "messages.windows.front_right.open"
-				}
-			}
+			"source": "low-can/messages.windows.front_right.open"
 		},
 		{
-			"id": "rear_right_door",
-			"source": "low-can/messages.doors.rear_right.open",
-			"class": "state",
-			"onReceived": {
-				"function": "_Door_opened",
-				"args": {
-					"evtname": "messages.doors.rear_right.open"
-				}
-			}
+			"id": "front_right_door",
+			"source": "low-can/messages.doors.front_right.open"
 		},
 		{
-			"id": "rear_right_window",
-			"source": "low-can/messages.windows.rear_right.open",
-			"class": "state",
+			"id": "rear_left",
+			"source": [
+				"rear_left_window",
+				"rear_left_door"
+			],
 			"onReceived": {
-				"function": "_Door_opened",
+				"plugin": "Door handle",
+				"function": "isOpen",
 				"args": {
-					"evtname": "messages.windows.rear_right.open"
+					"ojoi": "pok"
 				}
 			}
 		},
 		{
 			"id": "rear_right",
 			"source": [
-				"rear_right_doors",
-				"rear_right_windows"
+				"rear_right_door",
+				"rear_right_window"
 			],
-			"class": "state",
 			"onReceived": {
-				"function": "_Complete_Door",
+				"plugin": "Door handle",
+				"function": "isOpen",
 				"args": {}
 			}
 		},
@@ -85,41 +62,41 @@
 			"id": "front_left",
 			"source": [
 				"front_left_door",
-				"front_left_windows"
+				"front_left_window"
 			],
-			"class": "state",
 			"onReceived": {
-				"function": "_Complete_Door",
+				"plugin": "Door handle",
+				"function": "isOpen",
 				"args": {}
 			}
 		},
 		{
 			"id": "front_right",
 			"source": [
-				"front_right_doors",
-				"front_right_windows"
+				"front_right_door",
+				"front_right_window"
 			],
-			"class": "state",
 			"onReceived": {
-				"function": "_Complete_Door",
+				"plugin": "Door handle",
+				"function": "isOpen",
 				"args": {}
 			}
 		},
 		{
 			"id": "all_doors",
 			"source": [
-				"front_left_doors",
-				"front_left_windows",
-				"front_right_doors",
-				"front_right_windows",
-				"rear_left_doors",
-				"rear_left_windows",
-				"rear_right_doors",
-				"rear_right_windows"
+				"front_left_door",
+				"front_left_window",
+				"front_right_door",
+				"front_right_window",
+				"rear_left_door",
+				"rear_left_window",
+				"rear_right_door",
+				"rear_right_window"
 			],
-			"class": "state",
 			"onReceived": {
-				"function": "_Door_opened",
+				"plugin": "Door handle",
+				"function": "isOpen",
 				"args": {
 					"evtname": "doors.open"
 				}
-- 
cgit 1.2.3-korg