From 18a20b5d14ccc9ce6dcdab8b13e2b1822bb70f79 Mon Sep 17 00:00:00 2001
From: ave <ave@ave.zone>
Date: Mon, 21 Aug 2023 17:37:34 +0200
Subject: [PATCH] audio passthrough: fix forcing line in when trrs and line in
are plugged in
---
python_payload/apps/audio_passthrough/__init__.py | 6 ++++--
python_payload/apps/audio_passthrough/flow3r.toml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/python_payload/apps/audio_passthrough/__init__.py b/python_payload/apps/audio_passthrough/__init__.py
index aa60653d6c..56036120c0 100644
--- a/python_payload/apps/audio_passthrough/__init__.py
+++ b/python_payload/apps/audio_passthrough/__init__.py
@@ -108,10 +108,12 @@ class AudioPassthrough(Application):
headset_connected = audio.headset_is_connected()
if self._force_mode == "FORCE_MIC":
audio.input_set_source(audio.INPUT_SOURCE_ONBOARD_MIC)
+ elif (
+ audio.line_in_is_connected() and self._force_mode == "AUTO"
+ ) or self._force_mode == "FORCE_LINE_IN":
+ audio.input_set_source(audio.INPUT_SOURCE_LINE_IN)
elif headset_connected or self._force_mode == "FORCE_LINE_OUT":
audio.input_set_source(audio.INPUT_SOURCE_HEADSET_MIC)
- elif audio.line_in_is_connected() or self._force_mode == "FORCE_LINE_IN":
- audio.input_set_source(audio.INPUT_SOURCE_LINE_IN)
else:
audio.input_set_source(audio.INPUT_SOURCE_NONE)
diff --git a/python_payload/apps/audio_passthrough/flow3r.toml b/python_payload/apps/audio_passthrough/flow3r.toml
index 81f864112a..9ec2f0a28b 100644
--- a/python_payload/apps/audio_passthrough/flow3r.toml
+++ b/python_payload/apps/audio_passthrough/flow3r.toml
@@ -10,4 +10,4 @@ author = "ave"
license = "LGPL-3.0-only"
url = "https://git.flow3r.garden/flow3r/flow3r-firmware"
description = "Allows toggling audio passthrough through line-in/mic to speaker or lineout."
-version = 6
+version = 7
--
GitLab