diff options
Diffstat (limited to 'conf.d')
| -rw-r--r-- | conf.d/project/etc/control-signal-composer.json | 19 | ||||
| -rw-r--r-- | conf.d/project/etc/control-txc-demo.json (renamed from conf.d/project/etc/control-basic-conf.json) | 20 | ||||
| -rw-r--r-- | conf.d/project/etc/sig-geoloc.json | 16 | ||||
| -rw-r--r-- | conf.d/project/etc/sources-basic.json (renamed from conf.d/project/etc/sources.json) | 7 |
4 files changed, 25 insertions, 37 deletions
diff --git a/conf.d/project/etc/control-signal-composer.json b/conf.d/project/etc/control-signal-composer.json index d6083e1..0ed9fac 100644 --- a/conf.d/project/etc/control-signal-composer.json +++ b/conf.d/project/etc/control-signal-composer.json @@ -5,13 +5,13 @@ "version": "1.0", "api": "signal-composer", "info": "Signal composer Configuration", - "require": ["txc-binding"] + "require": ["low-can"] }, "plugins": [ { - "uid": "convert", - "info": "LUA fonctions used to convert standard unit.", - "libs": "unit-conversion.lua" + "uid": "low-can-callbacks", + "info": "Manage interaction with low-can service", + "libs": "low-can.ctlso" }, { "uid": "gps-callbacks", @@ -19,16 +19,15 @@ "libs": "gps.ctlso" }, { - "uid": "builtin", - "info": "Builtin routine for onReceived or getSignals routines", - "libs": "builtin.ctlso", - "lua": { "prefix": "composer", "functions": "setSignalValueWrap"} + "uid": "convert", + "info": "LUA fonctions used to convert standard unit.", + "libs": "unit-conversion.lua" } ], "signals": { - "files": ["sig-txc" ] + "files": ["sig-doors", "sig-demoboard", "sig-geoloc" ] }, "sources": { - "files": "sources-txc" + "files": "sources-basic" } } diff --git a/conf.d/project/etc/control-basic-conf.json b/conf.d/project/etc/control-txc-demo.json index 1331544..d6083e1 100644 --- a/conf.d/project/etc/control-basic-conf.json +++ b/conf.d/project/etc/control-txc-demo.json @@ -5,13 +5,13 @@ "version": "1.0", "api": "signal-composer", "info": "Signal composer Configuration", - "require": ["low-can"] + "require": ["txc-binding"] }, "plugins": [ { - "uid": "low-can-callbacks", - "info": "Manage interaction with low-can service", - "libs": "low-can.ctlso" + "uid": "convert", + "info": "LUA fonctions used to convert standard unit.", + "libs": "unit-conversion.lua" }, { "uid": "gps-callbacks", @@ -19,16 +19,16 @@ "libs": "gps.ctlso" }, { - "uid": "convert", - "info": "LUA fonctions used to convert standard unit.", - "spath": "/tmp", - "libs": "unit-conversion.lua" + "uid": "builtin", + "info": "Builtin routine for onReceived or getSignals routines", + "libs": "builtin.ctlso", + "lua": { "prefix": "composer", "functions": "setSignalValueWrap"} } ], "signals": { - "files": ["sig-doors", "sig-demoboard", "sig-geoloc" ] + "files": ["sig-txc" ] }, "sources": { - "files": "sources" + "files": "sources-txc" } } diff --git a/conf.d/project/etc/sig-geoloc.json b/conf.d/project/etc/sig-geoloc.json index d3040b8..a09d4d7 100644 --- a/conf.d/project/etc/sig-geoloc.json +++ b/conf.d/project/etc/sig-geoloc.json @@ -5,19 +5,13 @@ "uid": "latitude", "event": "gps/location", "unit": "degree", - "frequency": 1, - "onReceived": { - "action": "plugin://gps-callbacks#getLatitude" - } + "frequency": 1 }, { "uid": "longitude", "event": "gps/location", "unit": "degree", - "frequency": 1, - "onReceived": { - "action": "plugin://gps-callbacks#getLongitude" - } + "frequency": 1 }, { "uid": "altitude", @@ -47,19 +41,19 @@ }, { "uid": "climb", - "event": "mraa/getclimb", + "event": "gps/location", "unit": "degree", "frequency": 1 }, { "uid": "roll_rate", - "event": "mraa/gyroscope", + "event": "gps/location", "unit": "degree/s", "frequency": 1 }, { "uid": "pitch_rate", - "event": "mraa/gyroscope", + "event": "gps/location", "unit": "degree/s", "frequency": 1 }, diff --git a/conf.d/project/etc/sources.json b/conf.d/project/etc/sources-basic.json index 45d7706..be2d02f 100644 --- a/conf.d/project/etc/sources.json +++ b/conf.d/project/etc/sources-basic.json @@ -22,11 +22,6 @@ "getSignals": { "function": "lua://convert#_Simple_Echo_Args" } - }, - { - "uid": "MRAA-service", - "api": "mraa", - "info": "Low level binding which retrieve different values from several sensors like gyroscope, accelerometer, etc" - } + } ] } |