From 626bf1be5bc8b66d55a0c341ffcc359abb1ae768 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 16 Oct 2018 09:36:20 +0200 Subject: Update basic configurations files Update basic configurations files with the latest controller key used. There were update not followed since a rework a how an action is load from a configuration file which does not use anymore 2 key 'uri' + 'function' but only one 'action'. Change-Id: I455f69064bd91dd3b845e83d0904aca1c11cacb8 Signed-off-by: Romain Forlot --- conf.d/project/etc/sig-demoboard.json | 2 +- conf.d/project/etc/sig-doors.json | 35 +++++++++++++---------------------- conf.d/project/etc/sig-geoloc.json | 12 +++--------- conf.d/project/etc/sources.json | 8 +++----- 4 files changed, 20 insertions(+), 37 deletions(-) (limited to 'conf.d') diff --git a/conf.d/project/etc/sig-demoboard.json b/conf.d/project/etc/sig-demoboard.json index 2d9493f..bdd5e4e 100644 --- a/conf.d/project/etc/sig-demoboard.json +++ b/conf.d/project/etc/sig-demoboard.json @@ -12,7 +12,7 @@ "min": 10 }, "onReceived": { - "function": "lua://_Unit_Converter", + "action": "lua://convert#_Unit_Converter", "args": { "from": "km/h", "to": "mi/h" diff --git a/conf.d/project/etc/sig-doors.json b/conf.d/project/etc/sig-doors.json index 35f617e..6090b09 100644 --- a/conf.d/project/etc/sig-doors.json +++ b/conf.d/project/etc/sig-doors.json @@ -5,15 +5,14 @@ "uid": "rear_left_window", "event": "low-can/messages.windows.rear_left.open", "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen" + "action": "plugin://low-can-callbacks#isOpen" } }, { "uid": "rear_left_door", "event": "low-can/messages.doors.rear_left.open", "onReceived": { - "uri": "plugin://low-can-callbacks", + "action": "plugin://low-can-callbacks#isOpen", "function": "isOpen" } }, @@ -21,7 +20,7 @@ "uid": "rear_right_window", "event": "low-can/messages.windows.rear_right.open", "onReceived": { - "uri": "plugin://low-can-callbacks", + "action": "plugin://low-can-callbacks#isOpen", "function": "isOpen" } }, @@ -29,7 +28,7 @@ "uid": "rear_right_door", "event": "low-can/messages.doors.rear_right.open", "onReceived": { - "uri": "plugin://low-can-callbacks", + "action": "plugin://low-can-callbacks#isOpen", "function": "isOpen" } }, @@ -37,7 +36,7 @@ "uid": "front_left_window", "event": "low-can/messages.windows.front_left.open", "onReceived": { - "uri": "plugin://low-can-callbacks", + "action": "plugin://low-can-callbacks#isOpen", "function": "isOpen" } }, @@ -45,24 +44,21 @@ "uid": "front_left_door", "event": "low-can/messages.doors.front_left.open", "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen" + "action": "plugin://low-can-callbacks#isOpen" } }, { "uid": "front_right_window", "event": "low-can/messages.windows.front_right.open", "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen" + "action": "plugin://low-can-callbacks#isOpen" } }, { "uid": "front_right_door", "event": "low-can/messages.doors.front_right.open", "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen" + "action": "plugin://low-can-callbacks#isOpen" } }, { @@ -72,8 +68,7 @@ "rear_left_door" ], "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen" + "action": "plugin://low-can-callbacks#isOpen" } }, { @@ -83,8 +78,7 @@ "rear_right_window" ], "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen", + "action": "plugin://low-can-callbacks#isOpen", "args": {} } }, @@ -95,8 +89,7 @@ "front_left_window" ], "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen", + "action": "plugin://low-can-callbacks#isOpen", "args": {} } }, @@ -107,8 +100,7 @@ "front_right_window" ], "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen", + "action": "plugin://low-can-callbacks#isOpen", "args": {} } }, @@ -125,8 +117,7 @@ "rear_right_window" ], "onReceived": { - "uri": "plugin://low-can-callbacks", - "function": "isOpen", + "action": "plugin://low-can-callbacks#isOpen", "args": { "evtname": "doors.open" } diff --git a/conf.d/project/etc/sig-geoloc.json b/conf.d/project/etc/sig-geoloc.json index 0922b18..d3040b8 100644 --- a/conf.d/project/etc/sig-geoloc.json +++ b/conf.d/project/etc/sig-geoloc.json @@ -7,8 +7,7 @@ "unit": "degree", "frequency": 1, "onReceived": { - "uri": "plugin://gps-callbacks", - "function": "getLatitude" + "action": "plugin://gps-callbacks#getLatitude" } }, { @@ -17,11 +16,7 @@ "unit": "degree", "frequency": 1, "onReceived": { - "uri": "plugin://gps-callbacks", - "function": "getSignal", - "args": { - "what": "longitude" - } + "action": "plugin://gps-callbacks#getLongitude" } }, { @@ -40,8 +35,7 @@ "unit": "degree", "frequency": 1, "onReceived": { - "uri": "plugin://gps-callbacks", - "function": "getHeading" + "action": "plugin://gps-callbacks#getHeading" } }, { diff --git a/conf.d/project/etc/sources.json b/conf.d/project/etc/sources.json index 35d62a8..45d7706 100644 --- a/conf.d/project/etc/sources.json +++ b/conf.d/project/etc/sources.json @@ -6,8 +6,7 @@ "api": "low-can", "info": "Low level binding to handle CAN bus communications", "getSignals": { - "uri": "plugin://low-can-callbacks", - "function": "subscribeToLow" + "action": "plugin://low-can-callbacks#subscribeToLow" } }, { @@ -15,14 +14,13 @@ "api": "gps", "info": "Low level binding which retrieve Satellite positionning values", "init": { - "uri": "api://gps", - "function": "subscribe", + "action": "api://gps#subscribe", "args": { "value": "location" } }, "getSignals": { - "function": "lua://_Simple_Echo_Args" + "function": "lua://convert#_Simple_Echo_Args" } }, { -- cgit 1.2.3-korg