aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Jahnke <tobias.jahnke@microchip.com>2019-02-12 16:42:23 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-02-18 10:52:39 +0000
commit9c73c05e9a1b18ed43c6898683e403fd3e74e859 (patch)
tree62a3aeafa350c2dbd8770846f1f6b8c99ea4877d
parent64638079c4021bd090a0899660b4f58134d4062c (diff)
Bug-AGL: SPEC-2173 - updates plugin names to unicens-output and unicens-input - adds new ramps as used by greenbox - adds simple-microphone Change-Id: Ib910b291174b4e6737a346fe2d2dd1827232bff9 Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com> (cherry picked from commit 005877c18ce07b4c982fbba40058a3707d2d1126)
-rw-r--r--devices/hal-4a-unicens-coax.json58
-rw-r--r--devices/hal-4a-unicens-utp.json58
2 files changed, 90 insertions, 26 deletions
diff --git a/devices/hal-4a-unicens-coax.json b/devices/hal-4a-unicens-coax.json
index e6ef3ba..84f851e 100644
--- a/devices/hal-4a-unicens-coax.json
+++ b/devices/hal-4a-unicens-coax.json
@@ -11,30 +11,29 @@
},
"resources": [
{
- "uid": "hal-unicens",
- "info": "UNICENS HAL plugin",
+ "uid": "hal-unicens-output",
+ "info": "UNICENS HAL plugin for output audio",
"spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
- "libs": ["hal-unicens.ctlso"]
+ "libs": ["hal-unicens-output.ctlso"]
+ },
+ {
+ "uid": "hal-unicens-md-input",
+ "info": "UNICENS HAL plugin for input multi-directional microphone",
+ "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
+ "libs": ["hal-unicens-md-input.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"
+ "action": "plugin://hal-unicens-output#Init"
}
],
"events": [
{
"uid": "UNICENS/node-availibility",
- "action": "plugin://hal-unicens#Events"
+ "action": "plugin://hal-unicens-output#Events"
}
],
"halmap": [
@@ -53,7 +52,7 @@
"step": 1
}
},
- "action": "plugin://hal-unicens#MasterVol"
+ "action": "plugin://hal-unicens-output#MasterVol"
}
],
"halmixer": {
@@ -62,6 +61,12 @@
"prefix": "ucs",
"ramps": [
{
+ "uid": "ramp-very-fast",
+ "delay": 50,
+ "up": 6,
+ "down": 10
+ },
+ {
"uid": "ramp-fast",
"delay": 50,
"up": 2,
@@ -75,6 +80,12 @@
},
{
"uid": "ramp-slow",
+ "delay": 50,
+ "up": 2,
+ "down": 2
+ },
+ {
+ "uid": "ramp-very-slow",
"delay": 100,
"up": 1,
"down": 1
@@ -116,6 +127,27 @@
]
}
},
+ "captures": [
+ {
+ "uid": "MOST_MIC_EP822CH",
+ "cardid": "hw:ep822ch",
+ "params": {
+ "rate": 48000
+ },
+ "source": {
+ "channels": [
+ {
+ "uid": "mic-right",
+ "port": 0
+ },
+ {
+ "uid": "mic-left",
+ "port": 1
+ }
+ ]
+ }
+ }
+ ],
"zones": [
{
"uid": "full-stereo",
diff --git a/devices/hal-4a-unicens-utp.json b/devices/hal-4a-unicens-utp.json
index db04b5b..8d9b522 100644
--- a/devices/hal-4a-unicens-utp.json
+++ b/devices/hal-4a-unicens-utp.json
@@ -11,30 +11,29 @@
},
"resources": [
{
- "uid": "hal-unicens",
- "info": "UNICENS HAL plugin",
+ "uid": "hal-unicens-output",
+ "info": "UNICENS HAL plugin for output audio",
"spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
- "libs": ["hal-unicens.ctlso"]
+ "libs": ["hal-unicens-output.ctlso"]
+ },
+ {
+ "uid": "hal-unicens-md-input",
+ "info": "UNICENS HAL plugin for input multi-directional microphone",
+ "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var:/usr/libexec/agl/4a-hal",
+ "libs": ["hal-unicens-md-input.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"
+ "action": "plugin://hal-unicens-output#Init"
}
],
"events": [
{
"uid": "UNICENS/node-availibility",
- "action": "plugin://hal-unicens#Events"
+ "action": "plugin://hal-unicens-output#Events"
}
],
"halmap": [
@@ -53,7 +52,7 @@
"step": 1
}
},
- "action": "plugin://hal-unicens#MasterVol"
+ "action": "plugin://hal-unicens-output#MasterVol"
}
],
"halmixer": {
@@ -62,6 +61,12 @@
"prefix": "ucs",
"ramps": [
{
+ "uid": "ramp-very-fast",
+ "delay": 50,
+ "up": 6,
+ "down": 10
+ },
+ {
"uid": "ramp-fast",
"delay": 50,
"up": 2,
@@ -75,6 +80,12 @@
},
{
"uid": "ramp-slow",
+ "delay": 50,
+ "up": 2,
+ "down": 2
+ },
+ {
+ "uid": "ramp-very-slow",
"delay": 100,
"up": 1,
"down": 1
@@ -116,6 +127,27 @@
]
}
},
+ "captures": [
+ {
+ "uid": "MOST_MIC_EP822CH",
+ "cardid": "hw:ep822ch",
+ "params": {
+ "rate": 48000
+ },
+ "source": {
+ "channels": [
+ {
+ "uid": "mic-right",
+ "port": 0
+ },
+ {
+ "uid": "mic-left",
+ "port": 1
+ }
+ ]
+ }
+ }
+ ],
"zones": [
{
"uid": "full-stereo",