summaryrefslogtreecommitdiffstats
path: root/4a-hal-cfg-community
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-28 19:22:15 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:55:26 +0200
commit85fd2f13f9daf96b18aa4bd72d36d838172eaca9 (patch)
tree902fac9cba3d8b2713f42f7cfd48cc14defa4e7e /4a-hal-cfg-community
parentaf048eb67d8ecc0e9c8f0a9bc4543e3d101ce230 (diff)
Disable community hals by default
Disable community hals by default. Also move some hals from reference configurations directory to community configurations directory. Add prefixes to all hal for mixer attach. Change-Id: Ib1f74c313dbc4596457f9535d3e593a7019b55fa Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
Diffstat (limited to '4a-hal-cfg-community')
-rw-r--r--4a-hal-cfg-community/CMakeLists.txt2
-rw-r--r--4a-hal-cfg-community/hal-4a-2ch-generic-usb.json.disabled201
-rw-r--r--4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled (renamed from 4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json)1
-rw-r--r--4a-hal-cfg-community/hal-4a-ensoniq.json.disabled (renamed from 4a-hal-cfg-community/hal-4a-ensoniq.json)13
-rw-r--r--4a-hal-cfg-community/hal-4a-intel.json.disabled200
-rw-r--r--4a-hal-cfg-community/hal-4a-jabra.json.disabled (renamed from 4a-hal-cfg-community/hal-4a-jabra.json)7
6 files changed, 414 insertions, 10 deletions
diff --git a/4a-hal-cfg-community/CMakeLists.txt b/4a-hal-cfg-community/CMakeLists.txt
index 46b866e..7679315 100644
--- a/4a-hal-cfg-community/CMakeLists.txt
+++ b/4a-hal-cfg-community/CMakeLists.txt
@@ -21,7 +21,7 @@
##################################################
PROJECT_TARGET_ADD(4a-hal-cfg-community)
- file(GLOB CONF_FILES "*.json")
+ file(GLOB CONF_FILES "*.json*")
add_input_files("${CONF_FILES}")
diff --git a/4a-hal-cfg-community/hal-4a-2ch-generic-usb.json.disabled b/4a-hal-cfg-community/hal-4a-2ch-generic-usb.json.disabled
new file mode 100644
index 0000000..84f8a96
--- /dev/null
+++ b/4a-hal-cfg-community/hal-4a-2ch-generic-usb.json.disabled
@@ -0,0 +1,201 @@
+{
+ "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
+ "metadata": {
+ "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
+ "version": "0.9",
+ "api": "4a-hal-2ch-generic-usb",
+ "require": [ "alsacore", "smixer" ],
+ "info": "4a hal for 2ch generic USB device",
+ "author": "Jonathan Aillet",
+ "date": "2018-06-13"
+ },
+ "controls": [
+ {
+ "uid": "ping",
+ "info": "Ping hal",
+ "action": "api://4a-hal-manager#ping"
+ }
+ ],
+ "halmap": [
+ {
+ "uid": "agl-master-playback-volume",
+ "alsa": {
+ "name": "Speaker Playback Volume",
+ "value": 80
+ }
+ },
+ {
+ "uid": "agl-master-playback-switch",
+ "alsa": {
+ "name": "Speaker Playback Switch",
+ "value": 1
+ }
+ },
+ {
+ "uid": "agl-mic-capture-volume",
+ "alsa": {
+ "name": "Mic Capture Volume",
+ "value": 80
+ }
+ },
+ {
+ "uid": "agl-mic-capture-switch",
+ "alsa": {
+ "name": "Mic Capture Switch",
+ "value": 1
+ }
+ }
+ ],
+ "halmixer": {
+ "uid": "2ch-generic-usb",
+ "mixerapi": "smixer",
+ "prefix": "2ch-usb",
+ "ramps": [
+ {
+ "uid": "ramp-very-fast",
+ "delay": 50,
+ "up": 6,
+ "down": 10
+ },
+ {
+ "uid": "ramp-fast",
+ "delay": 50,
+ "up": 2,
+ "down": 10
+ },
+ {
+ "uid": "ramp-normal",
+ "delay": 50,
+ "up": 2,
+ "down": 4
+ },
+ {
+ "uid": "ramp-slow",
+ "delay": 50,
+ "up": 2,
+ "down": 2
+ },
+ {
+ "uid": "ramp-very-slow",
+ "delay": 100,
+ "up": 1,
+ "down": 1
+ }
+ ],
+ "playbacks" : {
+ "uid": "2CH-GENERIC-USB",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
+ "params": {
+ "rate": 48000
+ },
+ "sink": {
+ "controls": {
+ "volume": {
+ "name": "Speaker Playback Volume",
+ "value": 80
+ },
+ "mute": {
+ "name": "Speaker Playback Switch"
+ }
+ },
+ "channels": [
+ {
+ "uid": "front-right",
+ "port": 0
+ },
+ {
+ "uid": "front-left",
+ "port": 1
+ }
+ ]
+ }
+ },
+ "captures": {
+ "uid": "2CH-GENERIC-USB",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
+ "params": {
+ "rate": 48000
+ },
+ "source": {
+ "controls": {
+ "volume": {
+ "name": "Capture Volume"
+ },
+ "mute": {
+ "name": "Capture Switch"
+ }
+ },
+ "channels": [
+ {
+ "uid": "mic-right",
+ "port": 0
+ },
+ {
+ "uid": "mic-left",
+ "port": 1
+ }
+ ]
+ }
+ },
+ "zones": [
+ {
+ "uid": "full-stereo",
+ "sink": [
+ {
+ "target": "front-right",
+ "channel": 0
+ },
+ {
+ "target": "front-left",
+ "channel": 1
+ }
+ ]
+ },
+ {
+ "uid": "front-seats",
+ "sink": [
+ {
+ "target": "front-right",
+ "channel": 0
+ },
+ {
+ "target": "front-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/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json b/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled
index 18dd1cb..0b5d954 100644
--- a/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json
+++ b/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled
@@ -65,6 +65,7 @@
"halmixer": {
"uid": "csl-cm106-8ch-usb",
"mixerapi": "smixer",
+ "prefix": "cm106-usb",
"ramps": [
{
"uid": "ramp-fast",
diff --git a/4a-hal-cfg-community/hal-4a-ensoniq.json b/4a-hal-cfg-community/hal-4a-ensoniq.json.disabled
index 809acf8..f884247 100644
--- a/4a-hal-cfg-community/hal-4a-ensoniq.json
+++ b/4a-hal-cfg-community/hal-4a-ensoniq.json.disabled
@@ -1,7 +1,7 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03",
+ "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"version": "0.9",
"api": "4a-hal-ensoniq",
"require": [ "alsacore", "smixer" ],
@@ -46,8 +46,9 @@
}
],
"halmixer": {
- "uid": "jabra-solemate",
+ "uid": "ensoniq",
"mixerapi": "smixer",
+ "prefix": "ensoniq",
"ramps": [
{
"uid": "ramp-very-fast",
@@ -81,8 +82,8 @@
}
],
"playbacks" : {
- "uid": "JABRA-SOLEMATE",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03",
+ "uid": "ENSONIQ",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
@@ -109,8 +110,8 @@
}
},
"captures": {
- "uid": "JABRA-SOLEMATE",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03",
+ "uid": "ENSONIQ",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
diff --git a/4a-hal-cfg-community/hal-4a-intel.json.disabled b/4a-hal-cfg-community/hal-4a-intel.json.disabled
new file mode 100644
index 0000000..bab8364
--- /dev/null
+++ b/4a-hal-cfg-community/hal-4a-intel.json.disabled
@@ -0,0 +1,200 @@
+{
+ "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
+ "metadata": {
+ "uid": "/dev/snd/by-path/pci-0000:00:1b.0",
+ "version": "0.9",
+ "api": "4a-hal-intel",
+ "require": [ "alsacore", "smixer" ],
+ "info": "4a hal for Intel device",
+ "author": "Jonathan Aillet",
+ "date": "2018-06-13"
+ },
+ "controls": [
+ {
+ "uid": "ping",
+ "info": "Ping hal",
+ "action": "api://4a-hal-manager#ping"
+ }
+ ],
+ "halmap": [
+ {
+ "uid": "agl-master-playback-volume",
+ "alsa": {
+ "name": "Master Playback Volume",
+ "value": 100
+ }
+ },
+ {
+ "uid": "agl-pcm-playback-volume",
+ "alsa": {
+ "name": "PCM Playback Volume",
+ "value": 100
+ }
+ },
+ {
+ "uid": "agl-master-playback-switch",
+ "alsa": {
+ "name": "Master Playback Switch",
+ "value": 1
+ }
+ },
+ {
+ "uid": "agl-capture-volume",
+ "alsa": {
+ "name": "Capture Volume"
+ }
+ }
+ ],
+ "halmixer": {
+ "uid": "intel",
+ "mixerapi": "smixer",
+ "prefix": "intel-generic",
+ "ramps": [
+ {
+ "uid": "ramp-very-fast",
+ "delay": 50,
+ "up": 6,
+ "down": 10
+ },
+ {
+ "uid": "ramp-fast",
+ "delay": 50,
+ "up": 2,
+ "down": 10
+ },
+ {
+ "uid": "ramp-normal",
+ "delay": 50,
+ "up": 2,
+ "down": 4
+ },
+ {
+ "uid": "ramp-slow",
+ "delay": 50,
+ "up": 2,
+ "down": 2
+ },
+ {
+ "uid": "ramp-very-slow",
+ "delay": 100,
+ "up": 1,
+ "down": 1
+ }
+ ],
+ "playbacks" : {
+ "uid": "INTEL",
+ "path": "/dev/snd/by-path/pci-0000:00:1b.0",
+ "params": {
+ "rate": 48000
+ },
+ "sink": {
+ "controls": {
+ "volume": {
+ "name": "Master Playback Volume",
+ "value": 80
+ },
+ "mute": {
+ "name": "Master Playback Switch"
+ }
+ },
+ "channels": [
+ {
+ "uid": "front-right",
+ "port": 0
+ },
+ {
+ "uid": "front-left",
+ "port": 1
+ }
+ ]
+ }
+ },
+ "captures": {
+ "uid": "INTEL",
+ "path": "/dev/snd/by-path/pci-0000:00:1b.0",
+ "params": {
+ "rate": 48000
+ },
+ "source": {
+ "controls": {
+ "volume": {
+ "name": "Capture Volume"
+ },
+ "mute": {
+ "name": "Capture Switch"
+ }
+ },
+ "channels": [
+ {
+ "uid": "mic-right",
+ "port": 0
+ },
+ {
+ "uid": "mic-left",
+ "port": 1
+ }
+ ]
+ }
+ },
+ "zones": [
+ {
+ "uid": "full-stereo",
+ "sink": [
+ {
+ "target": "front-right",
+ "channel": 0
+ },
+ {
+ "target": "front-left",
+ "channel": 1
+ }
+ ]
+ },
+ {
+ "uid": "front-seats",
+ "sink": [
+ {
+ "target": "front-right",
+ "channel": 0
+ },
+ {
+ "target": "front-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/4a-hal-cfg-community/hal-4a-jabra.json b/4a-hal-cfg-community/hal-4a-jabra.json.disabled
index e2d60d2..8a95020 100644
--- a/4a-hal-cfg-community/hal-4a-jabra.json
+++ b/4a-hal-cfg-community/hal-4a-jabra.json.disabled
@@ -1,7 +1,7 @@
{
"$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
"metadata": {
- "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02",
+ "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"version": "0.9",
"api": "4a-hal-jabra-solemate",
"require": [ "alsacore", "smixer" ],
@@ -48,6 +48,7 @@
"halmixer": {
"uid": "jabra-solemate",
"mixerapi": "smixer",
+ "prefix": "jabra-solemate",
"ramps": [
{
"uid": "ramp-very-fast",
@@ -82,7 +83,7 @@
],
"playbacks" : {
"uid": "JABRA-SOLEMATE",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},
@@ -110,7 +111,7 @@
},
"captures": {
"uid": "JABRA-SOLEMATE",
- "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02",
+ "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-00",
"params": {
"rate": 48000
},