From 2c2c0bf6a34459ac324b30a52d45acb4cde48ace Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Wed, 1 Feb 2023 15:33:21 +0100 Subject: [PATCH] another alc level adjustment --- tnc/modem.py | 12 ++++++------ tnc/rigctld.py | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tnc/modem.py b/tnc/modem.py index d00996c6..f5fb4175 100644 --- a/tnc/modem.py +++ b/tnc/modem.py @@ -544,21 +544,21 @@ class RF: # Re-sample back up to 48k (resampler works on np.int16) x = np.frombuffer(txbuffer, dtype=np.int16) if static.AUDIO_AUTO_TUNE: - if static.HAMLIB_ALC == 0.0 and static.TX_AUDIO_LEVEL <= 10: - static.TX_AUDIO_LEVEL = 30 + if static.HAMLIB_ALC == 0.0: + static.TX_AUDIO_LEVEL = static.TX_AUDIO_LEVEL + 30 elif 0.0 < static.HAMLIB_ALC <= 0.8: print("0.001 > static.HAMLIB_ALC <= 0.8") static.TX_AUDIO_LEVEL = static.TX_AUDIO_LEVEL + 20 - self.log.debug("[MDM] AUDIO TUNE", level=str(static.TX_AUDIO_LEVEL), alc=str(static.HAMLIB_ALC)) + self.log.debug("[MDM] AUDIO TUNE", audio_level=str(static.TX_AUDIO_LEVEL), alc_level=str(static.HAMLIB_ALC)) elif 0.8 < static.HAMLIB_ALC < 0.99: print("0.8 > static.HAMLIB_ALC <= 0.99") static.TX_AUDIO_LEVEL = static.TX_AUDIO_LEVEL + 2 - self.log.debug("[MDM] AUDIO TUNE", level=str(static.TX_AUDIO_LEVEL), alc=str(static.HAMLIB_ALC)) + self.log.debug("[MDM] AUDIO TUNE", audio_level=str(static.TX_AUDIO_LEVEL), alc_level=str(static.HAMLIB_ALC)) elif 1.0 < static.HAMLIB_ALC: static.TX_AUDIO_LEVEL = static.TX_AUDIO_LEVEL - 2 - self.log.debug("[MDM] AUDIO TUNE", level=str(static.TX_AUDIO_LEVEL), alc=str(static.HAMLIB_ALC)) + self.log.debug("[MDM] AUDIO TUNE", audio_level=str(static.TX_AUDIO_LEVEL), alc_level=str(static.HAMLIB_ALC)) else: - self.log.debug("[MDM] AUDIO TUNE", level=str(static.TX_AUDIO_LEVEL), alc=str(static.HAMLIB_ALC)) + self.log.debug("[MDM] AUDIO TUNE", audio_level=str(static.TX_AUDIO_LEVEL), alc_level=str(static.HAMLIB_ALC)) x = set_audio_volume(x, static.TX_AUDIO_LEVEL) txbuffer_48k = self.resampler.resample8_to_48(x) diff --git a/tnc/rigctld.py b/tnc/rigctld.py index 2c7b3cfb..9a3137d1 100644 --- a/tnc/rigctld.py +++ b/tnc/rigctld.py @@ -9,6 +9,7 @@ import socket import time import structlog import threading +import static # set global hamlib version hamlib_version = 0 @@ -260,7 +261,7 @@ class radio: if alc != 0.0: self.alc = alc else: - self.alc = 0.0 + self.alc = static.HAMLIB_ALC except ValueError: self.alc = 0.0