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-geoloc.json | 105 ++++++++++++++++++++++---------------
 1 file changed, 62 insertions(+), 43 deletions(-)

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

diff --git a/conf.d/project/etc/sig-geoloc.json b/conf.d/project/etc/sig-geoloc.json
index 7fc4d29..3b0e4eb 100644
--- a/conf.d/project/etc/sig-geoloc.json
+++ b/conf.d/project/etc/sig-geoloc.json
@@ -1,136 +1,155 @@
 {
 	"signals": [
 		{
-			"label": "gps/latitude",
-			"class": "state",
+			"id": "latitude",
+			"event": "gps/location",
 			"unit": "degree",
-			"frequency": 1
+			"frequency": 1,
+			"onReceived": {
+				"function": "plugin://gps-callbacks/getLatitude"
+			}
 		},
 		{
-			"label": "gps/longitude",
-			"class": "state",
+			"id": "longitude",
+			"event": "gps/location",
 			"unit": "degree",
-			"frequency": 1
+			"frequency": 1,
+			"onReceived": {
+				"function": "plugin://gps-callbacks/getSignal",
+				"args": {
+					"what": "longitude"
+				}
+			}
 		},
 		{
-			"label": "gps/altitude",
-			"class": "state",
+			"id": "altitude",
+			"event": "gps/location",
 			"unit": "meter",
 			"frequency": 1
 		},
 		{
-			"label": "heading",
+			"id": "heading",
+			"depends": [
+				"latitude",
+				"longitude"
+			],
 			"class": "state",
 			"unit": "degree",
 			"frequency": 1,
-			"dependsOn": [
-				"gps/latitude",
-				"gps/longitude"
-			],
 			"actions": {
-				"label": "Heading calculation",
+				"id": "Heading calculation",
 				"lua": "_Heading",
 				"args": {}
 			}
 		},
 		{
-			"label": "gps/speed",
+			"id": "speed",
+			"event": "gps/location",
 			"class": "temporal",
 			"unit": "m/s",
 			"frequency": 1
 		},
 		{
-			"label": "mraa/climb",
-			"class": "state",
+			"id": "climb",
+			"event": "mraa/getclimb",
 			"unit": "degree",
 			"frequency": 1
 		},
 		{
-			"label": "mraa/roll_rate",
-			"class": "state",
+			"id": "roll_rate",
+			"event": "mraa/gyroscope",
 			"unit": "degree/s",
 			"frequency": 1
 		},
 		{
-			"label": "mraa/roll_rate",
-			"class": "state",
+			"id": "pitch_rate",
+			"event": "mraa/gyroscope",
 			"unit": "degree/s",
 			"frequency": 1
 		},
 		{
-			"label": "mraa/roll_rate",
-			"class": "state",
+			"id": "yaw_rate",
+			"event": "gps/gyroscope",
 			"unit": "degree/s",
 			"frequency": 1
 		},
 		{
-			"label": "gps/pdop",
+			"id": "pdop",
+			"event": "gps/location",
 			"frequency": 1
 		},
 		{
-			"label": "gps/hdop",
+			"id": "hdop",
+			"event": "gps/location",
 			"frequency": 1
 		},
 		{
-			"label": "gps/vdop",
+			"id": "vdop",
+			"event": "gps/location",
 			"frequency": 1
 		},
 		{
-			"label": "gps/used_satellites",
+			"id": "used_satellites",
+			"event": "gps/location",
 			"frequency": 1
 		},
 		{
-			"label": "gps/tracked_satellites",
+			"id": "tracked_satellites",
+			"event": "gps/location",
 			"frequency": 1
 		},
 		{
-			"label": "gps/visible_satellites",
+			"id": "visible_satellites",
+			"event": "gps/location",
 			"frequency": 1
 		},
 		{
-			"label": "gps/sigma_hposition",
-			"class": "state",
+			"id": "sigma_hposition",
+			"event": "gps/location",
 			"unit": "meter",
 			"frequency": 1
 		},
 		{
-			"label": "gps/sigma_altitude",
-			"class": "state",
+			"id": "sigma_altitude",
+			"event": "gps/location",
 			"unit": "meter",
 			"frequency": 1
 		},
 		{
-			"label": "gps/sigma_heading",
-			"class": "state",
+			"id": "sigma_heading",
+			"event": "gps/location",
 			"unit": "degree",
 			"frequency": 1
 		},
 		{
-			"label": "gps/sigma_speed",
+			"id": "sigma_speed",
+			"event": "gps/location",
 			"class": "temporal",
 			"unit": "m/s",
 			"frequency": 1
 		},
 		{
-			"label": "gps/sigma_climb",
-			"class": "state",
+			"id": "sigma_climb",
+			"event": "gps/location",
 			"unit": "degree",
 			"frequency": 1
 		},
 		{
-			"label": "gps/gnss_fix_status",
-			"class": "state",
+			"id": "gnss_fix_status",
+			"event": "gps/location",
 			"frequency": 1
 		},
 		{
-			"label": "gps/dr_status",
+			"id": "dr_status",
+			"event": "gps/location",
 			"class": "state",
 			"frequency": 1
 		},
 		{
-			"label": "gps/reliabilty_index",
+			"id": "reliabilty_index",
+			"event": "gps/location",
 			"class": "temporal",
 			"frequency": 1
 		}
 	]
-}
\ No newline at end of file
+}
-- 
cgit 1.2.3-korg