Skip to content

Fix bugs related to adafruit_wm8960.WM8960.input and adafruit_wm8960.WM8960.gain properties. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FoamyGuy merged 3 commits into from
Nov 5, 2024
Merged

Fix bugs related to adafruit_wm8960.WM8960.input and adafruit_wm8960.WM8960.gain properties. #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
167da1e
Fix `mic_mute` logic error.
relic-se Nov 5, 2024
d4e0883
Update `_input` before gain reset.
relic-se Nov 5, 2024
0232680
Force line input boost to mute when not selected.
relic-se Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions adafruit_wm8960/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,14 @@ def input(self, value: int) -> None:
self._codec.mic = mic
self._codec.mic_inverting_input = mic
self._codec.mic_input = (value & 0b110) >> 1 if mic else Mic_Input.VMID
self._codec.mic_mute = mic
self._codec.mic_mute = not mic
self._codec.mic_boost = mic

self._input = value

# Reset gain values
self.gain = self._gain

self._input = value

@property
def gain(self) -> float:
"""The amount of analog gain on the selected input before the ADC.
Expand All @@ -169,13 +169,13 @@ def gain(self, value: float) -> None:
self._codec.input2_boost = (
map_range(value, 0.0, 1.0, BOOST_GAIN_MIN, BOOST_GAIN_MAX)
if not mic and self._input & 0b010
else BOOST_GAIN_MIN
else BOOST_GAIN_MIN - 1.0
)

self._codec.input3_boost = (
map_range(value, 0.0, 1.0, BOOST_GAIN_MIN, BOOST_GAIN_MAX)
if not mic and self._input & 0b100
else BOOST_GAIN_MIN
else BOOST_GAIN_MIN - 1.0
)

self._gain = constrain(value, 0.0, 1.0)
Expand Down