diff --git a/alsa-ucm-oneplus/PKGBUILD b/alsa-ucm-oneplus/PKGBUILD index 8857b15..9c8c55b 100644 --- a/alsa-ucm-oneplus/PKGBUILD +++ b/alsa-ucm-oneplus/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Philip Müller pkgname=alsa-ucm-oneplus -pkgver=0.5.10 +pkgver=0.5.12 pkgrel=0 pkgdesc="UCM files for OnePlus (sdm845)" arch=(any) diff --git a/alsa-ucm-oneplus/fajita-HiFi.conf b/alsa-ucm-oneplus/fajita-HiFi.conf index 61f83dc..84740cc 100644 --- a/alsa-ucm-oneplus/fajita-HiFi.conf +++ b/alsa-ucm-oneplus/fajita-HiFi.conf @@ -49,7 +49,7 @@ SectionVerb { cset "name='MultiMedia4 Mixer SLIMBUS_1_TX' 0" cset "name='SLIMBUS_1_RX Audio Mixer MultiMedia5' 0" cset "name='MultiMedia6 Mixer SLIMBUS_2_TX' 0" - + cset "name='CDC_IF TX7 MUX' ZERO" cset "name='CDC_IF TX6 MUX' ZERO" cset "name='CDC_IF TX0 MUX' ZERO" @@ -60,7 +60,7 @@ SectionVerb { } } -SectionDevice."Mic" { +SectionDevice."Mic1" { Comment "Bottom Microphone" EnableSequence [ @@ -120,7 +120,7 @@ SectionDevice."Headphones" { cset "name='RX INT1_1 MIX1 INP0' RX2" cset "name='RX INT2_1 MIX1 INP0' RX3" ] - + DisableSequence [ cset "name='COMP1 Switch' 0" cset "name='COMP2 Switch' 0" @@ -132,7 +132,7 @@ SectionDevice."Headphones" { PlaybackPriority 30 PlaybackPCM "hw:${CardId},4" # MultiMedia5 PlaybackMixer "default:${CardId}" - JackControl "Headset Jack" + JackControl "Headphone Jack" } } @@ -154,6 +154,6 @@ SectionDevice."Headset" { CapturePCM "hw:${CardId},5" # MultiMedia6 CaptureMixerElem "ADC2" CaptureVolume "ADC2 Volume" - JackControl "Headset Jack" + JackControl "Headphone Jack" } } diff --git a/alsa-ucm-oneplus/fajita-VoiceCall.conf b/alsa-ucm-oneplus/fajita-VoiceCall.conf index ab877a5..4404ad0 100644 --- a/alsa-ucm-oneplus/fajita-VoiceCall.conf +++ b/alsa-ucm-oneplus/fajita-VoiceCall.conf @@ -36,7 +36,7 @@ SectionVerb { cset "name='SLIMBUS_0_RX Voice Mixer VoiceMMode1' 0" cset "name='VoiceMMode1 Capture Mixer SLIMBUS_0_TX' 0" - + cset "name='CDC_IF TX7 MUX' ZERO" ] diff --git a/alsa-ucm-oneplus/fajita.conf b/alsa-ucm-oneplus/fajita.conf index c885d71..fa68b06 100644 --- a/alsa-ucm-oneplus/fajita.conf +++ b/alsa-ucm-oneplus/fajita.conf @@ -16,7 +16,7 @@ Include.ctl-remap.File "/lib/ctl-remap.conf" BootSequence [ # Earpiece Volume cset "name='RX0 Digital Volume' 75" - + # Headphones Volume cset "name='RX1 Digital Volume' 75" cset "name='RX2 Digital Volume' 75" @@ -28,7 +28,7 @@ BootSequence [ # Phone Bottom Mic Analog and Digital Volumes cset "name='ADC4 Volume' 16" cset "name='DEC7 Volume' 75" - + # Phone Top Mic Analog and Digital Volumes cset "name='ADC3 Volume' 16" cset "name='DEC6 Volume' 75" diff --git a/sensors/oneplus-devices-udev/msm-modem-uim-selection.service b/sensors/oneplus-devices-udev/msm-modem-uim-selection.service index b8f0bac..b885e4b 100644 --- a/sensors/oneplus-devices-udev/msm-modem-uim-selection.service +++ b/sensors/oneplus-devices-udev/msm-modem-uim-selection.service @@ -6,7 +6,7 @@ Requires=ModemManager.service [Service] Type=oneshot -ExecStart=/usr/bin//msm-modem-uim-selection.sh +ExecStart=bash /usr/bin//msm-modem-uim-selection.sh RemainAfterExit=yes [Install] diff --git a/sensors/oneplus-devices-udev/msm-modem-uim-selection.sh b/sensors/oneplus-devices-udev/msm-modem-uim-selection.sh index 53b1207..8774c95 100644 --- a/sensors/oneplus-devices-udev/msm-modem-uim-selection.sh +++ b/sensors/oneplus-devices-udev/msm-modem-uim-selection.sh @@ -43,7 +43,7 @@ fi QMI_CARDS=$($QMICLI_MODEM --uim-get-card-status) # Fail if all slots are empty but wait a bit for the sim to appear. -count=0 +count=4 while ! printf "%s" "$QMI_CARDS" | grep -Fq "Card state: 'present'"; do if [ "$count" -ge "$sim_wait_time" ]; then echo "No sim detected after $sim_wait_time seconds."