From c461cb867a97a6d49945210f2050ea3d9ec44ab3 Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Thu, 31 May 2018 16:36:03 +0200 Subject: Updates json controller configuration files Change json configration files names to correpond to a real card. Updates 'halmixer' section to make it work with softmixer. Change-Id: I22c6b7dc661110be243544ea88abc1a7d34c6b53 Signed-off-by: Jonathan Aillet --- .../hal-4a-jon-home-usb-card.json | 180 ++++++++++++++++++++ .../hal-4a-jon-office-usb-headset.json | 182 +++++++++++++++++++++ 4a-hal-references-boards-cfg/hal-4a-sample1.json | 182 --------------------- 4a-hal-references-boards-cfg/hal-4a-sample2.json | 182 --------------------- 4 files changed, 362 insertions(+), 364 deletions(-) create mode 100644 4a-hal-references-boards-cfg/hal-4a-jon-home-usb-card.json create mode 100644 4a-hal-references-boards-cfg/hal-4a-jon-office-usb-headset.json delete mode 100644 4a-hal-references-boards-cfg/hal-4a-sample1.json delete mode 100644 4a-hal-references-boards-cfg/hal-4a-sample2.json (limited to '4a-hal-references-boards-cfg') diff --git a/4a-hal-references-boards-cfg/hal-4a-jon-home-usb-card.json b/4a-hal-references-boards-cfg/hal-4a-jon-home-usb-card.json new file mode 100644 index 0000000..688052d --- /dev/null +++ b/4a-hal-references-boards-cfg/hal-4a-jon-home-usb-card.json @@ -0,0 +1,180 @@ +{ + "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", + "metadata": { + "uid": "/dev/snd/by-id/usb-C-Media_Electronics_Inc._USB_Audio_Device-00", + "version": "0.9", + "api": "4a-hal-jon-home-usb-card", + "require": [ "softmixer" ], + "info": "Basic Audio Policy Control for Audio-4a - Jon's Office USB Card Audio", + "author": "Jonathan Aillet", + "date": "2018-05-18" + }, + "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": [ + { + "label": "Master_Playback_Volume", + "alsa": { + "name": "PCM Playback Volume", + "value": 12 + } + }, + { + "label": "Master_Playback_Ramp_70", + "info": "ramp volume linearly to 70 according to current ramp setting", + "alsa": { + "name": "Hal-VolRamp", + "numid": -1, + "type": "INTEGER", + "count": 1, + "minval": 0, + "maxval": 100, + "step": 1 + }, + "action": { + "label": "ramp-slow", + "callback": "api://4a-hal-jon-home-usb-card#master { ramp : 70 }" + } + } + ], + "halmixer": { + "uid": "jon-home-usb-card-mixer", + "mixerapi": "softmixer", + "backend": { + "uid": "Jon-Home-USB-Card-Audio", + "devpath": "/dev/snd/by-id/usb-C-Media_Electronics_Inc._USB_Audio_Device-00", + "sink": [ + { + "uid": "front-right", + "port": 0 + }, + { + "uid": "front-left", + "port": 1 + } + ] + }, + "frontend" : { + "uid": "Alsa-Loop", + "devpath": "/dev/snd/by-path/platform-snd_aloop.0", + "params": { + "rate": 48000, + }, + "ramps": [ + { + "uid": "ramp-fast", + "delay": 050, + "up": 10, + "down": 3 + }, + { + "uid": "ramp-slow", + "delay": 250, + "up": 03, + "down": 1 + }, + { + "uid": "ramp-normal", + "delay": 100, + "up": 06, + "down": 2 + } + ], + "devices": { + "playback": 0, + "capture": 1 + }, + "subdevs": [ + { + "subdev": 0, + "numid": 51 + }, + { + "subdev": 1, + "numid": 57 + }, + { + "subdev": 2, + "numid": 63 + }, + { + "subdev": 3, + "numid": 69 + }, + { + "subdev": 4, + "numid": 75 + }, + { + "subdev": 5, + "numid": 81 + }, + { + "subdev": 6, + "numid": 87 + }, + { + "subdev": 7, + "numid": 93 + } + ] + }, + "zones": [ + { + "uid": "front-seats", + "type": "playback", + "mapping": [ + { + "target": "front-right", + "channel": 0 + }, + { + "target": "front-left", + "channel": 1 + } + ] + } + ], + "streams": [ + { + "uid": "multimedia", + "zone": "front-seats", + "ramp": "ramp-slow", + "volume": 60, + "mute": false + }, + { + "uid": "navigation", + "zone": "front-seats", + "ramp": "ramp-normal", + "volume": 70, + "mute": false + }, + { + "uid": "emergency", + "zone": "front-seats", + "ramp": "ramp-fast", + "volume": 80, + "mute": false + } + ] + } +} diff --git a/4a-hal-references-boards-cfg/hal-4a-jon-office-usb-headset.json b/4a-hal-references-boards-cfg/hal-4a-jon-office-usb-headset.json new file mode 100644 index 0000000..31db610 --- /dev/null +++ b/4a-hal-references-boards-cfg/hal-4a-jon-office-usb-headset.json @@ -0,0 +1,182 @@ +{ + "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", + "metadata": { + "uid": "/dev/snd/by-id/usb-Plantronics_Plantronics_.Audio_655_DSP-00", + "version": "0.9", + "api": "4a-hal-jon-office-usb-headset", + "require": [ "softmixer" ], + "info": "Basic Audio Policy Control for Audio-4a - Jon's Office USB Headset Audio", + "author": "Jonathan Aillet", + "date": "2018-05-18" + }, + "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": [ + { + "label": "Master_Playback_Volume", + "alsa": { + "name": "PCM Playback Volume", + "value": 12 + } + }, + { + "label": "Master_Playback_Ramp_70", + "info": "ramp volume linearly to 70 according to current ramp setting", + "alsa": { + "name": "Hal-VolRamp", + "numid": -1, + "type": "INTEGER", + "count": 1, + "minval": 0, + "maxval": 100, + "step": 1 + }, + "action": { + "label": "ramp-slow", + "callback": "api://4a-hal-jon-office-usb-headset#master { ramp : 70 }" + } + } + ], + "halmixer": { + "uid": "jon-office-usb-headset-mixer", + "mixerapi": "softmixer", + "backend": { + "uid": "Jon-Office-USB-Headset-Audio", + "devpath": "/dev/snd/by-id/usb-Plantronics_Plantronics_.Audio_655_DSP-00", + "sink": [ + { + "uid": "front-right", + "port": 0 + }, + { + "uid": "front-left", + "port": 1 + } + ] + }, + "frontend" : { + "uid": "Alsa-Loop", + "devpath": "/dev/snd/by-path/platform-snd_aloop.0", + "params": { + "rate": 48000, + }, + "ramps": [ + { + "uid": "ramp-fast", + "delay": 050, + "up": 10, + "down": 3 + }, + { + "uid": "ramp-slow", + "delay": 250, + "up": 03, + "down": 1 + }, + { + "uid": "ramp-normal", + "delay": 100, + "up": 06, + "down": 2 + } + ], + "devices": [ + { + "playback": 0, + "capture": 1 + } + ], + "subdevs": [ + { + "subdev": 0, + "numid": 51 + }, + { + "subdev": 1, + "numid": 57 + }, + { + "subdev": 2, + "numid": 63 + }, + { + "subdev": 3, + "numid": 69 + }, + { + "subdev": 4, + "numid": 75 + }, + { + "subdev": 5, + "numid": 81 + }, + { + "subdev": 6, + "numid": 87 + }, + { + "subdev": 7, + "numid": 93 + } + ] + }, + "zones": [ + { + "uid": "front-seats", + "type": "playback", + "mapping": [ + { + "target": "front-right", + "channel": 0 + }, + { + "target": "front-left", + "channel": 1 + } + ] + } + ], + "streams": [ + { + "uid": "multimedia", + "zone": "front-seats", + "ramp": "ramp-slow", + "volume": 60, + "mute": false + }, + { + "uid": "navigation", + "zone": "front-seats", + "ramp": "ramp-normal", + "volume": 70, + "mute": false + }, + { + "uid": "emergency", + "zone": "front-seats", + "ramp": "ramp-fast", + "volume": 80, + "mute": false + } + ] + } +} diff --git a/4a-hal-references-boards-cfg/hal-4a-sample1.json b/4a-hal-references-boards-cfg/hal-4a-sample1.json deleted file mode 100644 index 86e14d7..0000000 --- a/4a-hal-references-boards-cfg/hal-4a-sample1.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-id/usb-Plantronics_Plantronics_.Audio_655_DSP-00", - "version": "0.9", - "api": "4a-hal-sample1", - "require": [ "4a-softmixer" ], - "info": "Basic Audio Policy Control for Audio-4a - Sample 1", - "author": "Jonathan Aillet", - "date": "2018-05-18" - }, - "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": [ - { - "label": "Master_Playback_Volume", - "alsa": { - "name": "PCM Playback Volume", - "value": 12 - } - }, - { - "label": "Master_Playback_Ramp_70", - "info": "ramp volume linearly to 70 according to current ramp setting", - "alsa": { - "name": "Hal-VolRamp", - "numid": -1, - "type": "INTEGER", - "count": 1, - "minval": 0, - "maxval": 100, - "step": 1 - }, - "action": { - "label": "ramp-slow", - "callback": "api://4a-hal-sample1#master { ramp : 70 }" - } - } - ], - "halmixer": { - "uid": "hal-4a-sample1-test-mixer", - "mixerapi": "4a-softmixer", - "backend": { - "uid": "Jon-Office-HeadsetUSB-Audio", - "devpath": "/dev/snd/by-id/usb-Plantronics_Plantronics_.Audio_655_DSP-00", - "sink": [ - { - "uid": "front-right", - "port": 0 - }, - { - "uid": "front-left", - "port": 1 - } - ] - }, - "frontend" : { - "uid": "Alsa-Loop", - "devpath": "/dev/snd/by-path/platform-snd_aloop.0", - "params": { - "rate": 48000, - }, - "ramps": [ - { - "uid": "ramp-fast", - "delay": 050, - "up": 10, - "down": 3 - }, - { - "uid": "ramp-slow", - "delay": 250, - "up": 03, - "down": 1 - }, - { - "uid": "ramp-normal", - "delay": 100, - "up": 06, - "down": 2 - } - ], - "devices": [ - { - "playback": 0, - "capture": 1 - } - ], - "subdevs": [ - { - "subdev": 0, - "numid": 51 - }, - { - "subdev": 1, - "numid": 57 - }, - { - "subdev": 2, - "numid": 63 - }, - { - "subdev": 3, - "numid": 69 - }, - { - "subdev": 4, - "numid": 75 - }, - { - "subdev": 5, - "numid": 81 - }, - { - "subdev": 6, - "numid": 87 - }, - { - "subdev": 7, - "numid": 93 - } - ] - }, - "zones": [ - { - "uid": "front-seats", - "type": "playback", - "mapping": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - } - ], - "streams": [ - { - "uid": "multimedia", - "zone": "front-seats", - "ramp": "ramp-slow", - "volume": 60, - "mute": false - }, - { - "uid": "navigation", - "zone": "front-seats", - "ramp": "ramp-normal", - "volume": 70, - "mute": false - }, - { - "uid": "emergency", - "zone": "front-seats", - "ramp": "ramp-fast", - "volume": 80, - "mute": false - } - ] - } -} \ No newline at end of file diff --git a/4a-hal-references-boards-cfg/hal-4a-sample2.json b/4a-hal-references-boards-cfg/hal-4a-sample2.json deleted file mode 100644 index 3816d1b..0000000 --- a/4a-hal-references-boards-cfg/hal-4a-sample2.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "/dev/snd/by-id/usb-C-Media_Electronics_Inc._USB_Audio_Device-00", - "version": "0.9", - "api": "4a-hal-sample2", - "require": [ "4a-softmixer" ], - "info": "Basic Audio Policy Control for Audio-4a - Sample 2", - "author": "Jonathan Aillet", - "date": "2018-05-18" - }, - "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": [ - { - "label": "Master_Playback_Volume", - "alsa": { - "name": "PCM Playback Volume", - "value": 12 - } - }, - { - "label": "Master_Playback_Ramp_70", - "info": "ramp volume linearly to 70 according to current ramp setting", - "alsa": { - "name": "Hal-VolRamp", - "numid": -1, - "type": "INTEGER", - "count": 1, - "minval": 0, - "maxval": 100, - "step": 1 - }, - "action": { - "label": "ramp-slow", - "callback": "api://4a-hal-sample1#master { ramp : 70 }" - } - } - ], - "halmixer": { - "uid": "hal-4a-sample2-test-mixer", - "mixerapi": "4a-softmixer", - "backend": { - "uid": "Jon-Home-USB-Audio", - "devpath": "/dev/snd/by-id/usb-C-Media_Electronics_Inc._USB_Audio_Device-00", - "sink": [ - { - "uid": "front-right", - "port": 0 - }, - { - "uid": "front-left", - "port": 1 - } - ] - }, - "frontend" : { - "uid": "Alsa-Loop", - "devpath": "/dev/snd/by-path/platform-snd_aloop.0", - "params": { - "rate": 48000, - }, - "ramps": [ - { - "uid": "ramp-fast", - "delay": 050, - "up": 10, - "down": 3 - }, - { - "uid": "ramp-slow", - "delay": 250, - "up": 03, - "down": 1 - }, - { - "uid": "ramp-normal", - "delay": 100, - "up": 06, - "down": 2 - } - ], - "devices": [ - { - "playback": 0, - "capture": 1 - } - ], - "subdevs": [ - { - "subdev": 0, - "numid": 51 - }, - { - "subdev": 1, - "numid": 57 - }, - { - "subdev": 2, - "numid": 63 - }, - { - "subdev": 3, - "numid": 69 - }, - { - "subdev": 4, - "numid": 75 - }, - { - "subdev": 5, - "numid": 81 - }, - { - "subdev": 6, - "numid": 87 - }, - { - "subdev": 7, - "numid": 93 - } - ] - }, - "zones": [ - { - "uid": "front-seats", - "type": "playback", - "mapping": [ - { - "target": "front-right", - "channel": 0 - }, - { - "target": "front-left", - "channel": 1 - } - ] - } - ], - "streams": [ - { - "uid": "multimedia", - "zone": "front-seats", - "ramp": "ramp-slow", - "volume": 60, - "mute": false - }, - { - "uid": "navigation", - "zone": "front-seats", - "ramp": "ramp-normal", - "volume": 70, - "mute": false - }, - { - "uid": "emergency", - "zone": "front-seats", - "ramp": "ramp-fast", - "volume": 80, - "mute": false - } - ] - } -} \ No newline at end of file -- cgit 1.2.3-korg