From e6c6211a873847013e0bec59364cc5064e43a288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= <43981173+UU5JPP@users.noreply.github.com> Date: Sat, 8 Jan 2022 20:58:47 +0300 Subject: [PATCH] VCXO_CALIBR DAC --- STM32/Core/Src/rf_unit.c | 2 +- STM32/Core/Src/settings.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/STM32/Core/Src/rf_unit.c b/STM32/Core/Src/rf_unit.c index 9ca6e48..12858dd 100644 --- a/STM32/Core/Src/rf_unit.c +++ b/STM32/Core/Src/rf_unit.c @@ -98,7 +98,7 @@ void RF_UNIT_ProcessSensors(void) else backward = 0.001f; - TRX_VLT_forward = 0.99f * TRX_VLT_forward + 0.01f * forward; + TRX_VLT_forward = 0.80f * TRX_VLT_forward + 0.20f * forward; TRX_VLT_backward = 0.99f * TRX_VLT_backward + 0.01f * backward; TRX_SWR = (TRX_VLT_forward + TRX_VLT_backward) / (TRX_VLT_forward - TRX_VLT_backward); diff --git a/STM32/Core/Src/settings.h b/STM32/Core/Src/settings.h index d18cbe5..0de39ca 100644 --- a/STM32/Core/Src/settings.h +++ b/STM32/Core/Src/settings.h @@ -12,7 +12,7 @@ //#define ADC_CLOCK 64320000 // ADC generator frequency //#define DAC_CLOCK 160800000 // DAC generator frequency #define ADC_CLOCK (int32_t)(61440000 + (CALIBRATE.VCXO_CALIBR * 10)) // ADC generator frequency калибровка частоты генератора -#define DAC_CLOCK 153600000 // DAC generator frequency +#define DAC_CLOCK (int32_t)(153600000 + (CALIBRATE.VCXO_CALIBR * 10)) // DAC generator frequency #define MAX_RX_FREQ_HZ 750000000 // Maximum receive frequency (from the ADC datasheet) #define MAX_TX_FREQ_HZ (DAC_CLOCK / 2) // Maximum transmission frequency #define TRX_SAMPLERATE 48000 // audio stream sampling rate during processing @@ -39,7 +39,7 @@ // select LCD, comment on others //#define LCD_ILI9481 true //#define LCD_HX8357B true // Alex -//#define LCD_HX8357C true // Alex +#define LCD_HX8357C true // Alex //#define LCD_ILI9486 true #define LCD_ILI9481_IPS true