diff options
| m--------- | conf.d/app-templates | 0 | ||||
| -rw-r--r-- | conf.d/project/etc/init-daemon.json | 19 | ||||
| -rw-r--r-- | conf.d/project/etc/sig-demoboard.json | 9 | ||||
| -rw-r--r-- | conf.d/project/etc/sig-doors.json | 27 | ||||
| -rw-r--r-- | conf.d/project/etc/sig-geoloc.json | 51 | ||||
| -rw-r--r-- | conf.d/project/etc/sources.json | 10 |
6 files changed, 65 insertions, 51 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject cd0660512276d935b7e5e6f5ebae538f64e16f3 +Subproject 6230618d8e66dc4902e43e7e85fa03317f209a0 diff --git a/conf.d/project/etc/init-daemon.json b/conf.d/project/etc/init-daemon.json index 045f3fe..8804b1d 100644 --- a/conf.d/project/etc/init-daemon.json +++ b/conf.d/project/etc/init-daemon.json @@ -1,25 +1,30 @@ { - "$schema": "ToBeDone", + "$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json", "metadata": { - "label": "Signal Composer", + "uid": "Signal Composer", "version": "1.0", "api": "test", "info": "Signal composer Configuration", - "require": ["low-can"], - "files": ["sources", "sig-doors", "sig-demoboard"] + "require": ["low-can"] }, "plugins": [ { - "label": "low-can-callbacks", + "uid": "low-can-callbacks", "version": "1.0", "info": "Manage interaction with low-can service", "basename": "low-can" }, { - "label": "gps-callbacks", + "uid": "gps-callbacks", "version": "1.0", "info": "Manage interaction with gps service", "basename": "gps" } - ] + ], + "signals": { + "files": ["sig-doors", "sig-demoboard" ] + }, + "sources": { + "files": "sources" + } } diff --git a/conf.d/project/etc/sig-demoboard.json b/conf.d/project/etc/sig-demoboard.json index 1bccbff..bb64fe9 100644 --- a/conf.d/project/etc/sig-demoboard.json +++ b/conf.d/project/etc/sig-demoboard.json @@ -1,7 +1,8 @@ { + "$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json", "signals": [ { - "id": "vehicle_speed", + "uid": "vehicle_speed", "event": "low-can/diagnostic_messages.vehicle.speed", "retention": 30, "unit": "km/h", @@ -19,7 +20,7 @@ } }, { - "id": "engine_speed", + "uid": "engine_speed", "event": "low-can/diagnostic_messages.engine.speed", "retention": 30, "unit": "rpm", @@ -29,14 +30,14 @@ } }, { - "id": "fuel_level", + "uid": "fuel_level", "event": "low-can/diagnostic_messages.fuel.level", "retention":30, "unit": "liter", "frequency": 1 }, { - "id": "engine_load", + "uid": "engine_load", "event": "low-can/diagnostic_messages.engine.load", "retention":30, "unit": "Nm", diff --git a/conf.d/project/etc/sig-doors.json b/conf.d/project/etc/sig-doors.json index 1d23f9a..427269a 100644 --- a/conf.d/project/etc/sig-doors.json +++ b/conf.d/project/etc/sig-doors.json @@ -1,7 +1,8 @@ { + "$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json", "signals": [ { - "id": "rear_left_window", + "uid": "rear_left_window", "event": "low-can/messages.windows.rear_left.open", "onReceived": { "function": "plugin://low-can-callbacks/isOpen", @@ -11,7 +12,7 @@ } }, { - "id": "rear_left_door", + "uid": "rear_left_door", "event": "low-can/messages.doors.rear_left.open", "onReceived": { "function": "plugin://low-can-callbacks/isOpen", @@ -21,7 +22,7 @@ } }, { - "id": "rear_right_window", + "uid": "rear_right_window", "event": "low-can/messages.windows.rear_right.open", "onReceived": { "function": "plugin://low-can-callbacks/isOpen", @@ -31,7 +32,7 @@ } }, { - "id": "rear_right_door", + "uid": "rear_right_door", "event": "low-can/messages.doors.rear_right.open", "onReceived": { "function": "plugin://low-can-callbacks/isOpen", @@ -41,7 +42,7 @@ } }, { - "id": "front_left_window", + "uid": "front_left_window", "event": "low-can/messages.windows.front_left.open", "onReceived": { "function": "plugin://low-can-callbacks/isOpen", @@ -51,7 +52,7 @@ } }, { - "id": "front_left_door", + "uid": "front_left_door", "event": "low-can/messages.doors.front_left.open", "onReceived": { "function": "plugin://low-can-callbacks/isOpen", @@ -61,7 +62,7 @@ } }, { - "id": "front_right_window", + "uid": "front_right_window", "event": "low-can/messages.windows.front_right.open", "onReceived": { "function": "plugin://low-can-callbacks/isOpen", @@ -71,7 +72,7 @@ } }, { - "id": "front_right_door", + "uid": "front_right_door", "event": "low-can/messages.doors.front_right.open", "onReceived": { "function": "plugin://low-can-callbacks/isOpen", @@ -81,7 +82,7 @@ } }, { - "id": "rear_left", + "uid": "rear_left", "depends": [ "rear_left_window", "rear_left_door" @@ -94,7 +95,7 @@ } }, { - "id": "rear_right", + "uid": "rear_right", "depends": [ "rear_right_door", "rear_right_window" @@ -105,7 +106,7 @@ } }, { - "id": "front_left", + "uid": "front_left", "depends": [ "front_left_door", "front_left_window" @@ -116,7 +117,7 @@ } }, { - "id": "front_right", + "uid": "front_right", "depends": [ "front_right_door", "front_right_window" @@ -127,7 +128,7 @@ } }, { - "id": "all_doors", + "uid": "all_doors", "depends": [ "front_left_door", "front_left_window", diff --git a/conf.d/project/etc/sig-geoloc.json b/conf.d/project/etc/sig-geoloc.json index 6bd18b6..02859a4 100644 --- a/conf.d/project/etc/sig-geoloc.json +++ b/conf.d/project/etc/sig-geoloc.json @@ -1,7 +1,8 @@ { + "$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json", "signals": [ { - "id": "latitude", + "uid": "latitude", "event": "gps/location", "unit": "degree", "frequency": 1, @@ -10,7 +11,7 @@ } }, { - "id": "longitude", + "uid": "longitude", "event": "gps/location", "unit": "degree", "frequency": 1, @@ -22,13 +23,13 @@ } }, { - "id": "altitude", + "uid": "altitude", "event": "gps/location", "unit": "meter", "frequency": 1 }, { - "id": "heading", + "uid": "heading", "depends": [ "latitude", "longitude" @@ -37,116 +38,116 @@ "unit": "degree", "frequency": 1, "actions": { - "id": "Heading calculation", - "lua": "_Heading", + "uid": "Heading calculation", + "function": "lua://_Heading", "args": {} } }, { - "id": "speed", + "uid": "speed", "event": "gps/location", "retention": 30, "unit": "m/s", "frequency": 1 }, { - "id": "climb", + "uid": "climb", "event": "mraa/getclimb", "unit": "degree", "frequency": 1 }, { - "id": "roll_rate", + "uid": "roll_rate", "event": "mraa/gyroscope", "unit": "degree/s", "frequency": 1 }, { - "id": "pitch_rate", + "uid": "pitch_rate", "event": "mraa/gyroscope", "unit": "degree/s", "frequency": 1 }, { - "id": "yaw_rate", + "uid": "yaw_rate", "event": "gps/gyroscope", "unit": "degree/s", "frequency": 1 }, { - "id": "pdop", + "uid": "pdop", "event": "gps/location", "frequency": 1 }, { - "id": "hdop", + "uid": "hdop", "event": "gps/location", "frequency": 1 }, { - "id": "vdop", + "uid": "vdop", "event": "gps/location", "frequency": 1 }, { - "id": "used_satellites", + "uid": "used_satellites", "event": "gps/location", "frequency": 1 }, { - "id": "tracked_satellites", + "uid": "tracked_satellites", "event": "gps/location", "frequency": 1 }, { - "id": "visible_satellites", + "uid": "visible_satellites", "event": "gps/location", "frequency": 1 }, { - "id": "sigma_hposition", + "uid": "sigma_hposition", "event": "gps/location", "unit": "meter", "frequency": 1 }, { - "id": "sigma_altitude", + "uid": "sigma_altitude", "event": "gps/location", "unit": "meter", "frequency": 1 }, { - "id": "sigma_heading", + "uid": "sigma_heading", "event": "gps/location", "unit": "degree", "frequency": 1 }, { - "id": "sigma_speed", + "uid": "sigma_speed", "event": "gps/location", "retention": 30, "unit": "m/s", "frequency": 1 }, { - "id": "sigma_climb", + "uid": "sigma_climb", "event": "gps/location", "unit": "degree", "frequency": 1 }, { - "id": "gnss_fix_status", + "uid": "gnss_fix_status", "event": "gps/location", "frequency": 1 }, { - "id": "dr_status", + "uid": "dr_status", "event": "gps/location", "retention": 30, "frequency": 1 }, { - "id": "reliabilty_index", + "uid": "reliabilty_index", "event": "gps/location", "retention": 30, "frequency": 1 diff --git a/conf.d/project/etc/sources.json b/conf.d/project/etc/sources.json index 396a6f9..0d04880 100644 --- a/conf.d/project/etc/sources.json +++ b/conf.d/project/etc/sources.json @@ -1,6 +1,8 @@ { + "$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json", "sources": [ { + "uid": "-serviceCAN", "api": "low-can", "info": "Low level binding to handle CAN bus communications", "getSignals": { @@ -9,7 +11,9 @@ "arg": "first argument" } } - }, { + }, + { + "uid": "GPS-service", "api": "gps", "info": "Low level binding which retrieve Satellite positionning values", "init": { @@ -24,7 +28,9 @@ "arg": "first argument" } } - }, { + }, + { + "uid": "MRAA-service", "api": "mraa", "info": "Low level binding which retrieve different values from several sensors like gyroscope, accelerometer, etc" } |