From 9e56268156e883d78f1c7e6eb1bfb884ffb33c38 Mon Sep 17 00:00:00 2001 From: Spencer Fowler Date: Sat, 6 Jan 2018 18:48:56 -0600 Subject: [PATCH] STM32-DVM & MMDVM_POG RSSI bugfix --- IOSTM_CMSIS.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/IOSTM_CMSIS.cpp b/IOSTM_CMSIS.cpp index 0e70d19..4ae144d 100644 --- a/IOSTM_CMSIS.cpp +++ b/IOSTM_CMSIS.cpp @@ -290,6 +290,9 @@ static inline void ADCInit() // Trigger first conversion ADC1->CR2 |= ADC_CR2_ADON; +#if defined(SEND_RSSI_DATA) + ADC2->CR2 |= ADC_CR2_ADON; +#endif } @@ -355,10 +358,16 @@ void CIO::interrupt() uint16_t rawRSSI = 0U; bitband_t eoc = (bitband_t)BITBAND_PERIPH(&ADC1->SR, ADC_SR_EOS_Pos); bitband_t adon = (bitband_t)BITBAND_PERIPH(&ADC1->CR2, ADC_CR2_ADON_Pos); +#if defined(SEND_RSSI_DATA) + bitband_t rssi_adon = (bitband_t)BITBAND_PERIPH(&ADC2->CR2, ADC_CR2_ADON_Pos); +#endif if (*eoc) { // trigger next conversion *adon = 1; +#if defined(SEND_RSSI_DATA) + *rssi_adon = 1; +#endif m_txBuffer.get(sample, control); DAC->DHR12R1 = sample; // Send the value to the DAC