Attach and recursion check working

Change-Id: I2f9509d4b6aa63a16df8db2187810337fd802ef4
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

5 files changed, 119 insertions, 132 deletions

diff --git a/conf.d/project/etc/init-daemon.json b/conf.d/project/etc/init-daemon.json
new file mode 100644
index 0000000..dc18f7e
--- /dev/null
+++ b/conf.d/project/etc/init-daemon.json
@@ -0,0 +1,19 @@
+{
+	"$schema": "ToBeDone",
+	"metadata": {
+		"label": "Signal Composer",
+		"version": "1.0",
+		"api": "signal-composer",
+		"info": "Signal composer Configuration",
+		"require": ["low-can"],
+		"files": ["sources", "sig-doors"]
+	},
+	"plugins": [
+		{
+			"label": "Door handle",
+			"version": "1.0",
+			"info": "Manage all doors and windows status",
+			"basename": "doors"
+		}
+	]
+}
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"
 				}
diff --git a/conf.d/project/etc/sig-sources.json b/conf.d/project/etc/sig-sources.json
deleted file mode 100644
index 1142196..0000000
--- a/conf.d/project/etc/sig-sources.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-	"$schema": "ToBeDone",
-	"metadata": {
-		"label": "signal-composer",
-		"info": "Signal composer Configuration",
-		"name": "afb-signal-composer",
-		"version": "1.0"
-	},
-	"sources": [
-		{
-			"api": "low-can",
-			"info": "Low level binding to handle CAN bus communications",
-			"init": {
-				"function": "c/lua (depend on name) function to initialize binding",
-				"args": {
-					"arg1": "first argument"
-				}
-		},
-			"getSignal": {
-				"function": "c/lua (depend on name) function to get signals",
-				"args": {
-					"arg": "first argument"
-				}
-			}
-		}, {
-			"api": "gps",
-			"info": "Low level binding which retrieve Satellite positionning values",
-			"actions": [{
-				"label": "init",
-				"function": "c/lua (depend on name) function to initialize binding",
-				"args": {
-					"arg": "first argument"
-				}
-			}, {
-				"label": "getSignal",
-				"function": "c/lua (depend on name) function to get signals",
-				"args": {
-					"arg": "first argument"
-				}
-			}]
-		}, {
-			"api": "mraa",
-			"info": "Low level binding which retrieve different values from several sensors like gyroscope, accelerometer, etc",
-			"actions": [{
-				"label": "init",
-				"function": "c/lua (depend on name) function to initialize binding",
-				"args": {
-					"arg": "first argument"
-				}
-			}, {
-				"label": "getSignal",
-				"function": "c/lua (depend on name) function to get signals",
-				"args": {
-					"arg": "first argument"
-				}
-			}]
-		}
-	]
-}
diff --git a/conf.d/project/etc/sources.json b/conf.d/project/etc/sources.json
new file mode 100644
index 0000000..a70da50
--- /dev/null
+++ b/conf.d/project/etc/sources.json
@@ -0,0 +1,50 @@
+{
+	"sources": [
+		{
+			"api": "low-can",
+			"info": "Low level binding to handle CAN bus communications",
+			"init": {
+				"function": "low-can/subscribe",
+				"args": {
+					"event": "message*"
+				}
+		},
+			"getSignal": {
+				"function": "_LUA_Simple_Echo_Args",
+				"args": {
+					"arg": "first argument"
+				}
+			}
+		}, {
+			"api": "gps",
+			"info": "Low level binding which retrieve Satellite positionning values",
+			"init": {
+				"function": "_LUA_Simple_Echo_Args",
+				"args": {
+					"arg1": "first argument"
+				}
+		},
+			"getSignal": {
+				"function": "_LUA_Simple_Echo_Args",
+				"args": {
+					"arg": "first argument"
+				}
+			}
+		}, {
+			"api": "mraa",
+			"info": "Low level binding which retrieve different values from several sensors like gyroscope, accelerometer, etc",
+			"init": {
+				"function": "_LUA_Simple_Echo_Args",
+				"args": {
+					"arg1": "first argument"
+				}
+		},
+			"getSignal": {
+				"function": "_LUA_Simple_Echo_Args",
+				"args": {
+					"arg": "first argument"
+				}
+			}
+		}
+	]
+}
diff --git a/conf.d/project/lua.d/onload-daemon-04-oncall.lua b/conf.d/project/lua.d/onload-daemon-04-oncall.lua
index b450932..7c0e9bc 100644
--- a/conf.d/project/lua.d/onload-daemon-04-oncall.lua
+++ b/conf.d/project/lua.d/onload-daemon-04-oncall.lua
@@ -22,7 +22,7 @@
 _count=0
 
 -- Display receive arguments and echo them to caller
-function _Simple_Echo_Args (request, args)
+function _LUA_Simple_Echo_Args (request, args)
     _count=_count+1
     AFB:notice("LUA OnCall Echo Args count=%d args=%s", count, args)