From 9320bd286b749f089c7da5fce54971f9d436d311 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 9 Feb 2021 20:05:18 +0100 Subject: [PATCH] More bumps and sound related changes --- .../mycroft-skill-ovos-pairing.mk | 2 +- .../python-ovos-utils/python-ovos-utils.hash | 2 +- .../python-ovos-utils/python-ovos-utils.mk | 2 +- .../rootfs-overlay/etc/voicecard/asound.state | 718 +----------------- .../etc/voicecard/default-asound.state | 58 ++ .../lib/systemd/system/alsa-restore.service | 2 +- 6 files changed, 63 insertions(+), 721 deletions(-) mode change 100644 => 120000 buildroot-external/rootfs-overlay/etc/voicecard/asound.state create mode 100644 buildroot-external/rootfs-overlay/etc/voicecard/default-asound.state diff --git a/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk b/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk index d631e6ae..abd61d8c 100644 --- a/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk +++ b/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk @@ -4,7 +4,7 @@ # ################################################################################ -MYCROFT_SKILL_OVOS_PAIRING_VERSION = d8fea7c156fc91043d0782de94d5c348c12b71d7 +MYCROFT_SKILL_OVOS_PAIRING_VERSION = 1973ad0978516f11f5217af9f8303d82831e507d MYCROFT_SKILL_OVOS_PAIRING_SITE = git://github.com/OpenVoiceOS/skill-ovos-pairing MYCROFT_SKILL_OVOS_PAIRING_SITE_METHOD = git MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION = opt/mycroft/skills diff --git a/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash b/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash index 16b8d7dd..cd15d082 100644 --- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash +++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.hash @@ -1 +1 @@ -sha256 24204937c11bc0020ab43a91a5857ef33bea34f1dab790e416f0a7ce87495fc3 python-ovos-utils-baf507994dae1989899ee118e7064a7bd2912427.tar.gz +sha256 417094ab4016fba6f1347712f811f2ce93eb27deedee4e095d8bc52b8483c02a python-ovos-utils-7329fe7aa6454131e795d80f4ba6cc1c24cb3fed.tar.gz diff --git a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk index 6b8a7ea8..216d7da2 100644 --- a/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk +++ b/buildroot-external/package/python-ovos-utils/python-ovos-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_OVOS_UTILS_VERSION = baf507994dae1989899ee118e7064a7bd2912427 +PYTHON_OVOS_UTILS_VERSION = 7329fe7aa6454131e795d80f4ba6cc1c24cb3fed PYTHON_OVOS_UTILS_SITE = $(call github,OpenVoiceOS,ovos_utils,$(PYTHON_OVOS_UTILS_VERSION)) PYTHON_OVOS_UTILS_SETUP_TYPE = setuptools PYTHON_OVOS_UTILS_LICENSE_FILES = LICENSE diff --git a/buildroot-external/rootfs-overlay/etc/voicecard/asound.state b/buildroot-external/rootfs-overlay/etc/voicecard/asound.state deleted file mode 100644 index 9c47ad22..00000000 --- a/buildroot-external/rootfs-overlay/etc/voicecard/asound.state +++ /dev/null @@ -1,717 +0,0 @@ -state.Headphones { - control.1 { - iface MIXER - name 'Headphone Playback Volume' - value 400 - comment { - access 'read write' - type INTEGER - count 1 - range '-10239 - 400' - dbmin -9999999 - dbmax 400 - dbvalue.0 400 - } - } - control.2 { - iface MIXER - name 'Headphone Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } -} -state.wm8960soundcard { - control.1 { - iface MIXER - name 'Capture Volume' - value.0 63 - value.1 63 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 63' - dbmin -1725 - dbmax 3000 - dbvalue.0 3000 - dbvalue.1 3000 - } - } - control.2 { - iface MIXER - name 'Capture Volume ZC Switch' - value.0 0 - value.1 0 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 1' - } - } - control.3 { - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.4 { - iface MIXER - name 'Left Input Boost Mixer LINPUT3 Volume' - value 1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -9999999 - dbmax 600 - dbvalue.0 -1200 - } - } - control.5 { - iface MIXER - name 'Left Input Boost Mixer LINPUT2 Volume' - value 1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -9999999 - dbmax 600 - dbvalue.0 -1200 - } - } - control.6 { - iface MIXER - name 'Right Input Boost Mixer RINPUT3 Volume' - value 1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -9999999 - dbmax 600 - dbvalue.0 -1200 - } - } - control.7 { - iface MIXER - name 'Right Input Boost Mixer RINPUT2 Volume' - value 1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -9999999 - dbmax 600 - dbvalue.0 -1200 - } - } - control.8 { - iface MIXER - name 'Right Input Boost Mixer RINPUT1 Volume' - value 1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 3' - dbmin 0 - dbmax 2900 - dbvalue.0 1300 - } - } - control.9 { - iface MIXER - name 'Left Input Boost Mixer LINPUT1 Volume' - value 1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 3' - dbmin 0 - dbmax 2900 - dbvalue.0 1300 - } - } - control.10 { - iface MIXER - name 'Playback Volume' - value.0 255 - value.1 255 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 255' - dbmin -9999999 - dbmax 0 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.11 { - iface MIXER - name 'Headphone Playback Volume' - value.0 127 - value.1 127 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 127' - dbmin -9999999 - dbmax 600 - dbvalue.0 600 - dbvalue.1 600 - } - } - control.12 { - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.13 { - iface MIXER - name 'Speaker Playback Volume' - value.0 127 - value.1 127 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 127' - dbmin -9999999 - dbmax 600 - dbvalue.0 600 - dbvalue.1 600 - } - } - control.14 { - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - comment { - access 'read write' - type BOOLEAN - count 2 - } - } - control.15 { - iface MIXER - name 'Speaker DC Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 5' - } - } - control.16 { - iface MIXER - name 'Speaker AC Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 5' - } - } - control.17 { - iface MIXER - name 'PCM Playback -6dB Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.18 { - iface MIXER - name 'ADC Polarity' - value 'No Inversion' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'No Inversion' - item.1 'Left Inverted' - item.2 'Right Inverted' - item.3 'Stereo Inversion' - } - } - control.19 { - iface MIXER - name 'ADC High Pass Filter Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.20 { - iface MIXER - name 'DAC Polarity' - value 'No Inversion' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'No Inversion' - item.1 'Left Inverted' - item.2 'Right Inverted' - item.3 'Stereo Inversion' - } - } - control.21 { - iface MIXER - name 'DAC Deemphasis Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.22 { - iface MIXER - name '3D Filter Upper Cut-Off' - value High - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 High - item.1 Low - } - } - control.23 { - iface MIXER - name '3D Filter Lower Cut-Off' - value Low - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Low - item.1 High - } - } - control.24 { - iface MIXER - name '3D Volume' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.25 { - iface MIXER - name '3D Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.26 { - iface MIXER - name 'ALC Function' - value Off - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Off - item.1 Right - item.2 Left - item.3 Stereo - } - } - control.27 { - iface MIXER - name 'ALC Max Gain' - value 7 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.28 { - iface MIXER - name 'ALC Target' - value 4 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.29 { - iface MIXER - name 'ALC Min Gain' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.30 { - iface MIXER - name 'ALC Hold Time' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.31 { - iface MIXER - name 'ALC Mode' - value ALC - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 ALC - item.1 Limiter - } - } - control.32 { - iface MIXER - name 'ALC Decay' - value 3 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.33 { - iface MIXER - name 'ALC Attack' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.34 { - iface MIXER - name 'Noise Gate Threshold' - value 9 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - } - } - control.35 { - iface MIXER - name 'Noise Gate Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.36 { - iface MIXER - name 'ADC PCM Capture Volume' - value.0 195 - value.1 195 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 255' - dbmin -9999999 - dbmax 3000 - dbvalue.0 0 - dbvalue.1 0 - } - } - control.37 { - iface MIXER - name 'Left Output Mixer Boost Bypass Volume' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -2100 - dbmax 0 - dbvalue.0 -1500 - } - } - control.38 { - iface MIXER - name 'Left Output Mixer LINPUT3 Volume' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -2100 - dbmax 0 - dbvalue.0 -1500 - } - } - control.39 { - iface MIXER - name 'Right Output Mixer Boost Bypass Volume' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -2100 - dbmax 0 - dbvalue.0 -1500 - } - } - control.40 { - iface MIXER - name 'Right Output Mixer RINPUT3 Volume' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - dbmin -2100 - dbmax 0 - dbvalue.0 -1500 - } - } - control.41 { - iface MIXER - name 'ADC Data Output Select' - value 'Left Data = Left ADC; Right Data = Right ADC' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'Left Data = Left ADC; Right Data = Right ADC' - item.1 'Left Data = Left ADC; Right Data = Left ADC' - item.2 'Left Data = Right ADC; Right Data = Right ADC' - item.3 'Left Data = Right ADC; Right Data = Left ADC' - } - } - control.42 { - iface MIXER - name 'DAC Mono Mix' - value Stereo - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Stereo - item.1 Mono - } - } - control.43 { - iface MIXER - name 'Left Boost Mixer LINPUT2 Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.44 { - iface MIXER - name 'Left Boost Mixer LINPUT3 Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.45 { - iface MIXER - name 'Left Boost Mixer LINPUT1 Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.46 { - iface MIXER - name 'Right Boost Mixer RINPUT2 Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.47 { - iface MIXER - name 'Right Boost Mixer RINPUT3 Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.48 { - iface MIXER - name 'Right Boost Mixer RINPUT1 Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.49 { - iface MIXER - name 'Left Input Mixer Boost Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.50 { - iface MIXER - name 'Right Input Mixer Boost Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.51 { - iface MIXER - name 'Left Output Mixer PCM Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.52 { - iface MIXER - name 'Left Output Mixer LINPUT3 Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.53 { - iface MIXER - name 'Left Output Mixer Boost Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.54 { - iface MIXER - name 'Right Output Mixer PCM Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.55 { - iface MIXER - name 'Right Output Mixer RINPUT3 Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.56 { - iface MIXER - name 'Right Output Mixer Boost Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.57 { - iface MIXER - name 'Mono Output Mixer Left Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.58 { - iface MIXER - name 'Mono Output Mixer Right Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } -} diff --git a/buildroot-external/rootfs-overlay/etc/voicecard/asound.state b/buildroot-external/rootfs-overlay/etc/voicecard/asound.state new file mode 120000 index 00000000..815b046d --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/voicecard/asound.state @@ -0,0 +1 @@ +default-asound.state \ No newline at end of file diff --git a/buildroot-external/rootfs-overlay/etc/voicecard/default-asound.state b/buildroot-external/rootfs-overlay/etc/voicecard/default-asound.state new file mode 100644 index 00000000..53e98118 --- /dev/null +++ b/buildroot-external/rootfs-overlay/etc/voicecard/default-asound.state @@ -0,0 +1,58 @@ +state.ALSA { + control.1 { + iface MIXER + name 'PCM Playback Volume' + value -31 + comment { + access 'read write' + type INTEGER + count 1 + range '-10239 - 400' + dbmin -9999999 + dbmax 400 + dbvalue.0 -31 + } + } + control.2 { + iface MIXER + name 'PCM Playback Switch' + value true + comment { + access 'read write' + type BOOLEAN + count 1 + } + } + control.3 { + iface MIXER + name 'PCM Playback Route' + value 0 + comment { + access 'read write' + type INTEGER + count 1 + range '0 - 3' + } + } + control.4 { + iface PCM + name 'IEC958 Playback Default' + value '0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + comment { + access 'read write' + type IEC958 + count 1 + } + } + control.5 { + iface PCM + name 'IEC958 Playback Con Mask' + value '0200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' + comment { + access read + type IEC958 + count 1 + } + } +} + diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/alsa-restore.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/alsa-restore.service index 7990bf59..75d0d7af 100644 --- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system/alsa-restore.service +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system/alsa-restore.service @@ -7,7 +7,7 @@ Description=Save/Restore Sound Card State ConditionPathExists=!/etc/alsa/state-daemon.conf ConditionPathExistsGlob=/dev/snd/control* -ConditionPathExists=/var/lib/alsa/asound.state +ConditionPathExists=/etc/voicecard/asound.state [Service] Type=oneshot