From b3318e3a8892a45c0460da4b23fcc295ff7b1dad 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: Thu, 13 Jan 2022 15:14:12 +0300 Subject: [PATCH] 64 64,320 --- STM32/Core/Src/audio_processor.c | 2 +- STM32/Core/Src/settings.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/STM32/Core/Src/audio_processor.c b/STM32/Core/Src/audio_processor.c index a3e213b..3f42e57 100644 --- a/STM32/Core/Src/audio_processor.c +++ b/STM32/Core/Src/audio_processor.c @@ -788,7 +788,7 @@ static void DemodulateFM(uint16_t size) b = FM_RX_HPF_ALPHA * (*hpf_prev_b + a - *hpf_prev_a); // do differentiation *hpf_prev_a = a; // save "[n-1]" samples for next iteration *hpf_prev_b = b; - FPGA_Audio_Buffer_I_tmp[i] = b * 0.1f; // save demodulated and filtered audio in main audio processing buffer + FPGA_Audio_Buffer_I_tmp[i] = b * 0.3f; // save demodulated and filtered audio in main audio processing buffer } } else if (*squelched) // were we squelched or tone NOT detected? diff --git a/STM32/Core/Src/settings.h b/STM32/Core/Src/settings.h index 22cde2a..052d430 100644 --- a/STM32/Core/Src/settings.h +++ b/STM32/Core/Src/settings.h @@ -9,8 +9,8 @@ #define SETT_VERSION 101 // Settings config version #define CALIB_VERSION 100 // Calibration config version -//#define ADC_CLOCK 64320000 // ADC generator frequency -//#define DAC_CLOCK 160800000 // DAC generator frequency +//#define ADC_CLOCK (int32_t)(64320000 + (CALIBRATE.VCXO_CALIBR * 10)) // ADC generator frequency калибровка частоты генератора +//#define DAC_CLOCK (int32_t)(160800000 + (CALIBRATE.VCXO_CALIBR * 10)) // DAC generator frequency #define ADC_CLOCK (int32_t)(61440000 + (CALIBRATE.VCXO_CALIBR * 10)) // ADC 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)