summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Jahnke <tobias.jahnke@microchip.com>2018-10-17 11:42:45 +0200
committerTobias Jahnke <tobias.jahnke@microchip.com>2018-12-18 13:01:13 +0100
commit94e8568a23a691559d79d3ee5b7475fdedb1b126 (patch)
tree119e3bf9079e82e7f4390d8f7aa7b988ab938f01
parent17aecba553cd2aa114e35f80589ef5d5372d4ea0 (diff)
4a-hal-unicens: define different json files
Add different json files for OS81118 and OS81210. Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
-rw-r--r--cfg/hal-4a-unicens-118.json (renamed from cfg/hal-4a-unicens.json)4
-rw-r--r--cfg/hal-4a-unicens-210.json237
-rw-r--r--nbproject/configurations.xml3
-rw-r--r--plugin/CMakeLists.txt6
4 files changed, 242 insertions, 8 deletions
diff --git a/cfg/hal-4a-unicens.json b/cfg/hal-4a-unicens-118.json
index fad22e1..1a7e8e9 100644
--- a/cfg/hal-4a-unicens.json
+++ b/cfg/hal-4a-unicens-118.json
@@ -5,14 +5,14 @@
"version": "0.9",
"api": "4a-hal-unicens",
"require": [ "alsacore", "UNICENS", "smixer" ],
- "info": "4a hal for MICROCHIP MOST sound card controlled by UNICENS binding",
+ "info": "4a HAL for UNICENS INICnet OS81118",
"author": "Jonathan Aillet",
"date": "2018-06-15"
},
"resources": [
{
"uid": "hal-unicens",
- "info": "Unicens hal plugin to handle communication with unicens binder",
+ "info": "UNICENS HAL plugin",
"spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
"libs": ["hal-unicens.ctlso"]
}
diff --git a/cfg/hal-4a-unicens-210.json b/cfg/hal-4a-unicens-210.json
new file mode 100644
index 0000000..da5b647
--- /dev/null
+++ b/cfg/hal-4a-unicens-210.json
@@ -0,0 +1,237 @@
+{
+ "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
+ "metadata": {
+ "uid": "/dev/snd/by-id/usb-Microchip-SMSC_OS81210_0200-0000000C-02",
+ "version": "0.9",
+ "api": "4a-hal-unicens",
+ "require": [ "alsacore", "UNICENS", "smixer" ],
+ "info": "4a HAL for UNICENS INICnet OS81210",
+ "author": "Jonathan Aillet",
+ "date": "2018-06-15"
+ },
+ "resources": [
+ {
+ "uid": "hal-unicens",
+ "info": "UNICENS HAL plugin",
+ "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
+ "libs": ["hal-unicens.ctlso"]
+ }
+ ],
+ "onload": [
+ {
+ "uid": "init-audio-hal",
+ "info": "Init current HAL",
+ "action": "plugin://hal-unicens#Init"
+ }
+ ],
+ "controls": [
+ {
+ "uid": "ping",
+ "info": "Ping hal",
+ "action": "api://4a-hal-manager#ping"
+ }
+ ],
+ "events": [
+ {
+ "uid": "UNICENS/node-availibility",
+ "action": "plugin://hal-unicens#Events"
+ }
+ ],
+ "halmap": [
+ {
+ "uid": "agl-master-playback-volume",
+ "info": "Sets master playback volume",
+ "alsa": {
+ "name": "Master Playback Volume",
+ "value": 80,
+ "create":
+ {
+ "type": "INTEGER",
+ "count": 1,
+ "minval": 0,
+ "maxval": 100,
+ "step": 1
+ }
+ },
+ "action": "plugin://hal-unicens#MasterVol"
+ },
+ {
+ "uid": "agl-pcm-playback-volume",
+ "info": "Sets PCM playback volume",
+ "alsa": {
+ "name": "PCM Playback Volume",
+ "value": 100,
+ "create":
+ {
+ "type": "INTEGER",
+ "count": 1,
+ "minval": 0,
+ "maxval": 100,
+ "step": 1
+ }
+ },
+ "action": "plugin://hal-unicens#PCMVol"
+ }
+ ],
+ "halmixer": {
+ "uid": "unicens",
+ "mixerapi": "smixer",
+ "ramps": [
+ {
+ "uid": "ramp-fast",
+ "delay": 50,
+ "up": 2,
+ "down": 10
+ },
+ {
+ "uid": "ramp-normal",
+ "delay": 50,
+ "up": 2,
+ "down": 4
+ },
+ {
+ "uid": "ramp-slow",
+ "delay": 100,
+ "up": 1,
+ "down": 1
+ }
+ ],
+ "playbacks" : {
+ "uid": "UNICENS",
+ "path": "/dev/snd/by-id/usb-Microchip-SMSC_OS81210_0200-0000000C-02",
+ "params": {
+ "rate": 48000
+ },
+ "sink": {
+ "channels": [
+ {
+ "uid": "front-right",
+ "port": 0
+ },
+ {
+ "uid": "front-left",
+ "port": 1
+ },
+ {
+ "uid": "middle-right",
+ "port": 2
+ },
+ {
+ "uid": "middle-left",
+ "port": 3
+ },
+ {
+ "uid": "back-right",
+ "port": 4
+ },
+ {
+ "uid": "back-left",
+ "port": 5
+ }
+ ]
+ }
+ },
+ "zones": [
+ {
+ "uid": "full-stereo",
+ "sink": [
+ {
+ "target": "front-right",
+ "channel": 0
+ },
+ {
+ "target": "front-left",
+ "channel": 1
+ },
+ {
+ "target": "middle-right",
+ "channel": 0
+ },
+ {
+ "target": "middle-left",
+ "channel": 1
+ },
+ {
+ "target": "back-right",
+ "channel": 0
+ },
+ {
+ "target": "back-left",
+ "channel": 1
+ }
+ ]
+ },
+ {
+ "uid": "front-seats",
+ "sink": [
+ {
+ "target": "front-right",
+ "channel": 0
+ },
+ {
+ "target": "front-left",
+ "channel": 1
+ }
+ ]
+ },
+ {
+ "uid": "middle-seats",
+ "sink": [
+ {
+ "target": "middle-right",
+ "channel": 0
+ },
+ {
+ "target": "middle-left",
+ "channel": 1
+ }
+ ]
+ },
+ {
+ "uid": "back-seats",
+ "sink": [
+ {
+ "target": "back-right",
+ "channel": 0
+ },
+ {
+ "target": "back-left",
+ "channel": 1
+ }
+ ]
+ }
+ ],
+ "streams": [
+ {
+ "uid": "multimedia",
+ "verb": "multimedia",
+ "zone": "full-stereo",
+ "volume": 60,
+ "mute": false,
+ "params": {
+ "rate": 48000
+ }
+ },
+ {
+ "uid": "navigation",
+ "verb": "navigation",
+ "zone": "front-seats",
+ "volume": 70,
+ "mute": false,
+ "params": {
+ "rate": 48000
+ }
+ },
+ {
+ "uid": "emergency",
+ "verb": "emergency",
+ "zone": "front-seats",
+ "volume": 60,
+ "mute": false,
+ "params": {
+ "rate": 48000
+ }
+ }
+ ]
+ }
+}
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 58366d2..5578966 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -250,9 +250,6 @@
<pElem>/usr/include/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
<pElem>app-controller/ctl-lib</pElem>
- <pElem>4a-hal/4a-hal-controllers</pElem>
- <pElem>4a-hal/4a-hal-manager</pElem>
- <pElem>4a-hal/4a-hal-utilities</pElem>
<pElem>plugin/ucs2-vol/inc</pElem>
<pElem>afb-helpers</pElem>
<pElem>build/plugin</pElem>
diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
index df83eed..2672f72 100644
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@@ -45,8 +45,8 @@ PROJECT_TARGET_ADD(hal-unicens)
target_include_directories(${TARGET_NAME}
PRIVATE "${CMAKE_SOURCE_DIR}/app-controller/ctl-lib"
- PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-controllers"
- PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-manager"
- PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-utilities"
+ #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-controllers"
+ #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-manager"
+ #PRIVATE "${CMAKE_SOURCE_DIR}/4a-hal/4a-hal-utilities"
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/ucs2-vol/inc"
)