summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-08 10:20:38 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:52:51 +0200
commitc5d896901ae680afe3a970f6ff194dd27cb9fb6c (patch)
treed3195a0c34d97c809c9b7ffa21ca474fc0bc4cad
parentb19cb71cd6ab5f40d7cfcb2ee8f06b591b15966f (diff)
Updates json controller configuration files
Updates 'halmap' section to prepare it for incomming update that will handle alsa controls. Corrects mistakes in info field. Change-Id: I44a5fdfbaff47d0ce9975ded8227cb899af96c00 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--4a-hal-references-boards-cfg/hal-4a-jon-home-usb-card.json45
-rw-r--r--4a-hal-references-boards-cfg/hal-4a-jon-office-usb-headset.json43
2 files changed, 51 insertions, 37 deletions
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
index e9fafa5..802d11e 100644
--- 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
@@ -31,28 +31,35 @@
],
"halmap": [
{
- "label": "Master_Playback_Volume",
+ "uid": "agl-speaker-playback-switch",
"alsa": {
- "name": "PCM Playback Volume",
+ "name": "Speaker Playback Switch",
"value": 12
}
},
{
- "label": "Master_Playback_Ramp_70",
- "info": "ramp volume linearly to 70 according to current ramp setting",
+ "uid": "agl-speaker-playback-volume",
"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 }"
+ "numid": 6,
+ "value": 34
}
+ },
+ {
+ "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-jon-home-usb-card#ping"
}
],
"halmixer": {
@@ -76,25 +83,25 @@
"uid": "Alsa-Loop",
"devpath": "/dev/snd/by-path/platform-snd_aloop.0",
"params": {
- "rate": 48000,
+ "rate": 48000
},
"ramps": [
{
"uid": "ramp-fast",
- "delay": 050,
+ "delay": 50,
"up": 10,
"down": 3
},
{
"uid": "ramp-slow",
"delay": 250,
- "up": 03,
+ "up": 3,
"down": 1
},
{
"uid": "ramp-normal",
"delay": 100,
- "up": 06,
+ "up": 6,
"down": 2
}
],
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
index d919206..fd02814 100644
--- 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
@@ -31,28 +31,35 @@
],
"halmap": [
{
- "label": "Master_Playback_Volume",
+ "uid": "agl-speaker-playback-switch",
"alsa": {
- "name": "PCM Playback Volume",
+ "name": "Speaker Playback Switch",
"value": 12
}
},
{
- "label": "Master_Playback_Ramp_70",
- "info": "ramp volume linearly to 70 according to current ramp setting",
+ "uid": "agl-speaker-playback-volume",
"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 }"
+ "numid": 7,
+ "value": 34
}
+ },
+ {
+ "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-jon-home-usb-card#ping"
}
],
"halmixer": {
@@ -84,20 +91,20 @@
"ramps": [
{
"uid": "ramp-fast",
- "delay": 050,
+ "delay": 50,
"up": 10,
"down": 3
},
{
"uid": "ramp-slow",
"delay": 250,
- "up": 03,
+ "up": 3,
"down": 1
},
{
"uid": "ramp-normal",
"delay": 100,
- "up": 06,
+ "up": 6,
"down": 2
}
],