From 85fd2f13f9daf96b18aa4bd72d36d838172eaca9 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Thu, 28 Jun 2018 19:22:15 +0200 Subject: 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 --- 4a-hal-cfg-community/CMakeLists.txt | 2 +- .../hal-4a-2ch-generic-usb.json.disabled | 201 +++++++++++++++ 4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json | 281 -------------------- .../hal-4a-csl-cm106-8ch-usb.json.disabled | 282 +++++++++++++++++++++ 4a-hal-cfg-community/hal-4a-ensoniq.json | 199 --------------- 4a-hal-cfg-community/hal-4a-ensoniq.json.disabled | 200 +++++++++++++++ 4a-hal-cfg-community/hal-4a-intel.json.disabled | 200 +++++++++++++++ 4a-hal-cfg-community/hal-4a-jabra.json | 199 --------------- 4a-hal-cfg-community/hal-4a-jabra.json.disabled | 200 +++++++++++++++ 4a-hal-cfg-reference/CMakeLists.txt | 2 +- 4a-hal-cfg-reference/hal-4a-2ch-generic-usb.json | 200 --------------- 4a-hal-cfg-reference/hal-4a-intel-minnow.json | 1 + 4a-hal-cfg-reference/hal-4a-intel.json | 199 --------------- 13 files changed, 1086 insertions(+), 1080 deletions(-) create mode 100644 4a-hal-cfg-community/hal-4a-2ch-generic-usb.json.disabled delete mode 100644 4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json create mode 100644 4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled delete mode 100644 4a-hal-cfg-community/hal-4a-ensoniq.json create mode 100644 4a-hal-cfg-community/hal-4a-ensoniq.json.disabled create mode 100644 4a-hal-cfg-community/hal-4a-intel.json.disabled delete mode 100644 4a-hal-cfg-community/hal-4a-jabra.json create mode 100644 4a-hal-cfg-community/hal-4a-jabra.json.disabled delete mode 100644 4a-hal-cfg-reference/hal-4a-2ch-generic-usb.json delete mode 100644 4a-hal-cfg-reference/hal-4a-intel.json 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 deleted file mode 100644 index 18dd1cb..0000000 --- a/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json +++ /dev/null @@ -1,281 +0,0 @@ -{ - "$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-csl-cm106-8ch-usb", - "require": [ "alsacore", "smixer" ], - "info": "4a hal for CSL CM106 8ch USB device", - "author": "Jonathan Aillet", - "date": "2018-06-09" - }, - "onload": [ - { - "uid": "init-audio-hal", - "info": "Init current HAL", - "action": "api://4a-hal-manager#ping" - } - ], - "controls": [ - { - "uid": "ping", - "info": "Ping hal", - "action": "api://4a-hal-manager#ping" - } - ], - "events": [ - { - "uid": "api/status_changed", - "action": "api://4a-hal-manager#ping" - } - ], - "halmap": [ - { - "uid": "agl-mic-capture-volume", - "alsa": { - "name": "Mic Capture Volume", - "value": 60 - } - }, - { - "uid": "agl-speaker-playback-volume", - "alsa": { - "numid": 8, - "value": 80 - } - }, - { - "uid": "hal-ping", - "info": "ping this hal through alsa", - "alsa": { - "name": "Hal-Ping", - "value": 20, - "create": - { - "type": "INTEGER", - "count": 1, - "minval": 0, - "maxval": 100, - "step": 1 - } - }, - "action": "api://4a-hal-csl-cm106-8ch-usb#ping" - } - ], - "halmixer": { - "uid": "csl-cm106-8ch-usb", - "mixerapi": "smixer", - "ramps": [ - { - "uid": "ramp-fast", - "delay": 50, - "up": 10, - "down": 3 - }, - { - "uid": "ramp-slow", - "delay": 250, - "up": 3, - "down": 1 - }, - { - "uid": "ramp-normal", - "delay": 100, - "up": 6, - "down": 2 - } - ], - "playbacks" : { - "uid": "CSL-CM106-8CH-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 - }, - { - "uid": "middle-right", - "port": 2 - }, - { - "uid": "middle-left", - "port": 3 - }, - { - "uid": "back-right", - "port": 4 - }, - { - "uid": "back-left", - "port": 5 - }, - { - "uid": "center-right", - "port": 6 - }, - { - "uid": "center-left", - "port": 7 - } - ] - } - }, - "captures": { - "uid": "CSL-CM106-8CH-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 - }, - { - "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 - } - }, - { - "uid": "legacy", - "verb": "legacy", - "zone": "back-seats", - "source": "loop-legacy", - "volume": 50, - "mute": false, - "params": { - "rate": 48000 - } - } - ] - } -} diff --git a/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled b/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled new file mode 100644 index 0000000..0b5d954 --- /dev/null +++ b/4a-hal-cfg-community/hal-4a-csl-cm106-8ch-usb.json.disabled @@ -0,0 +1,282 @@ +{ + "$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-csl-cm106-8ch-usb", + "require": [ "alsacore", "smixer" ], + "info": "4a hal for CSL CM106 8ch USB device", + "author": "Jonathan Aillet", + "date": "2018-06-09" + }, + "onload": [ + { + "uid": "init-audio-hal", + "info": "Init current HAL", + "action": "api://4a-hal-manager#ping" + } + ], + "controls": [ + { + "uid": "ping", + "info": "Ping hal", + "action": "api://4a-hal-manager#ping" + } + ], + "events": [ + { + "uid": "api/status_changed", + "action": "api://4a-hal-manager#ping" + } + ], + "halmap": [ + { + "uid": "agl-mic-capture-volume", + "alsa": { + "name": "Mic Capture Volume", + "value": 60 + } + }, + { + "uid": "agl-speaker-playback-volume", + "alsa": { + "numid": 8, + "value": 80 + } + }, + { + "uid": "hal-ping", + "info": "ping this hal through alsa", + "alsa": { + "name": "Hal-Ping", + "value": 20, + "create": + { + "type": "INTEGER", + "count": 1, + "minval": 0, + "maxval": 100, + "step": 1 + } + }, + "action": "api://4a-hal-csl-cm106-8ch-usb#ping" + } + ], + "halmixer": { + "uid": "csl-cm106-8ch-usb", + "mixerapi": "smixer", + "prefix": "cm106-usb", + "ramps": [ + { + "uid": "ramp-fast", + "delay": 50, + "up": 10, + "down": 3 + }, + { + "uid": "ramp-slow", + "delay": 250, + "up": 3, + "down": 1 + }, + { + "uid": "ramp-normal", + "delay": 100, + "up": 6, + "down": 2 + } + ], + "playbacks" : { + "uid": "CSL-CM106-8CH-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 + }, + { + "uid": "middle-right", + "port": 2 + }, + { + "uid": "middle-left", + "port": 3 + }, + { + "uid": "back-right", + "port": 4 + }, + { + "uid": "back-left", + "port": 5 + }, + { + "uid": "center-right", + "port": 6 + }, + { + "uid": "center-left", + "port": 7 + } + ] + } + }, + "captures": { + "uid": "CSL-CM106-8CH-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 + }, + { + "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 + } + }, + { + "uid": "legacy", + "verb": "legacy", + "zone": "back-seats", + "source": "loop-legacy", + "volume": 50, + "mute": false, + "params": { + "rate": 48000 + } + } + ] + } +} diff --git a/4a-hal-cfg-community/hal-4a-ensoniq.json b/4a-hal-cfg-community/hal-4a-ensoniq.json deleted file mode 100644 index 809acf8..0000000 --- a/4a-hal-cfg-community/hal-4a-ensoniq.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03", - "version": "0.9", - "api": "4a-hal-ensoniq", - "require": [ "alsacore", "smixer" ], - "info": "4a hal for Ensoniq", - "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-mic-capture-volume", - "alsa": { - "name": "Capture Volume" - } - } - ], - "halmixer": { - "uid": "jabra-solemate", - "mixerapi": "smixer", - "ramps": [ - { - "uid": "ramp-very-fast", - "delay": 50, - "up": 6, - "down": 4 - }, - { - "uid": "ramp-fast", - "delay": 50, - "up": 2, - "down": 4 - }, - { - "uid": "ramp-normal", - "delay": 100, - "up": 6, - "down": 10 - }, - { - "uid": "ramp-slow", - "delay": 100, - "up": 4, - "down": 2 - }, - { - "uid": "ramp-very-slow", - "delay": 100, - "up": 1, - "down": 1 - } - ], - "playbacks" : { - "uid": "JABRA-SOLEMATE", - "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03", - "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": "JABRA-SOLEMATE", - "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-03", - "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-ensoniq.json.disabled b/4a-hal-cfg-community/hal-4a-ensoniq.json.disabled new file mode 100644 index 0000000..f884247 --- /dev/null +++ b/4a-hal-cfg-community/hal-4a-ensoniq.json.disabled @@ -0,0 +1,200 @@ +{ + "$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-ensoniq", + "require": [ "alsacore", "smixer" ], + "info": "4a hal for Ensoniq", + "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-mic-capture-volume", + "alsa": { + "name": "Capture Volume" + } + } + ], + "halmixer": { + "uid": "ensoniq", + "mixerapi": "smixer", + "prefix": "ensoniq", + "ramps": [ + { + "uid": "ramp-very-fast", + "delay": 50, + "up": 6, + "down": 4 + }, + { + "uid": "ramp-fast", + "delay": 50, + "up": 2, + "down": 4 + }, + { + "uid": "ramp-normal", + "delay": 100, + "up": 6, + "down": 10 + }, + { + "uid": "ramp-slow", + "delay": 100, + "up": 4, + "down": 2 + }, + { + "uid": "ramp-very-slow", + "delay": 100, + "up": 1, + "down": 1 + } + ], + "playbacks" : { + "uid": "ENSONIQ", + "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": "ENSONIQ", + "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-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 deleted file mode 100644 index e2d60d2..0000000 --- a/4a-hal-cfg-community/hal-4a-jabra.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02", - "version": "0.9", - "api": "4a-hal-jabra-solemate", - "require": [ "alsacore", "smixer" ], - "info": "4a hal for Jabra Solemate", - "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": "PCM Playback Volume", - "value": 80 - } - }, - { - "uid": "agl-pcm-playback-volume", - "alsa": { - "name": "PCM Playback Volume", - "value": 80 - } - }, - { - "uid": "agl-pcm-playback-switch", - "alsa": { - "name": "PCM Playback Switch", - "value": 1 - } - }, - { - "uid": "agl-mic-capture-volume", - "alsa": { - "name": "Mic Capture Volume" - } - } - ], - "halmixer": { - "uid": "jabra-solemate", - "mixerapi": "smixer", - "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": "JABRA-SOLEMATE", - "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02", - "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": "JABRA-SOLEMATE", - "path": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-02", - "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.disabled b/4a-hal-cfg-community/hal-4a-jabra.json.disabled new file mode 100644 index 0000000..8a95020 --- /dev/null +++ b/4a-hal-cfg-community/hal-4a-jabra.json.disabled @@ -0,0 +1,200 @@ +{ + "$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-jabra-solemate", + "require": [ "alsacore", "smixer" ], + "info": "4a hal for Jabra Solemate", + "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": "PCM Playback Volume", + "value": 80 + } + }, + { + "uid": "agl-pcm-playback-volume", + "alsa": { + "name": "PCM Playback Volume", + "value": 80 + } + }, + { + "uid": "agl-pcm-playback-switch", + "alsa": { + "name": "PCM Playback Switch", + "value": 1 + } + }, + { + "uid": "agl-mic-capture-volume", + "alsa": { + "name": "Mic Capture Volume" + } + } + ], + "halmixer": { + "uid": "jabra-solemate", + "mixerapi": "smixer", + "prefix": "jabra-solemate", + "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": "JABRA-SOLEMATE", + "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": "JABRA-SOLEMATE", + "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-reference/CMakeLists.txt b/4a-hal-cfg-reference/CMakeLists.txt index e8267f9..df54ef5 100644 --- a/4a-hal-cfg-reference/CMakeLists.txt +++ b/4a-hal-cfg-reference/CMakeLists.txt @@ -21,7 +21,7 @@ ################################################## PROJECT_TARGET_ADD(4a-hal-cfg-reference) - file(GLOB CONF_FILES "*.json") + file(GLOB CONF_FILES "*.json*") add_input_files("${CONF_FILES}") diff --git a/4a-hal-cfg-reference/hal-4a-2ch-generic-usb.json b/4a-hal-cfg-reference/hal-4a-2ch-generic-usb.json deleted file mode 100644 index fdc3b19..0000000 --- a/4a-hal-cfg-reference/hal-4a-2ch-generic-usb.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-id/usb-0d8c_USB_Sound_Device-01", - "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", - "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-01", - "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-01", - "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-reference/hal-4a-intel-minnow.json b/4a-hal-cfg-reference/hal-4a-intel-minnow.json index 0e78148..67c5467 100644 --- a/4a-hal-cfg-reference/hal-4a-intel-minnow.json +++ b/4a-hal-cfg-reference/hal-4a-intel-minnow.json @@ -35,6 +35,7 @@ "halmixer": { "uid": "intel-minnow", "mixerapi": "smixer", + "prefix": "intel-minnow", "ramps": [ { "uid": "ramp-very-fast", diff --git a/4a-hal-cfg-reference/hal-4a-intel.json b/4a-hal-cfg-reference/hal-4a-intel.json deleted file mode 100644 index d489c85..0000000 --- a/4a-hal-cfg-reference/hal-4a-intel.json +++ /dev/null @@ -1,199 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-path/pci-0000:00:1b.1", - "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", - "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.1", - "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.1", - "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 - } - } - ] - } -} -- cgit 1.2.3-korg