Unsignedio
/
MMDVM
mirror of https://github.com/markqvist/MMDVM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #137 from sfowlr/master 

STM32-DVM & MMDVM_POG RSSI bugfix
dstar_correlator
Jonathan Naylor 2018-01-07 13:28:01 +00:00 committed by GitHub
parent 3a539e1243 9e56268156
commit 78a51d416d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IOSTM_CMSIS.cpp
View File

@ -290,6 +290,9 @@ static inline void ADCInit()
// Trigger first conversion // Trigger first conversion
ADC1->CR2 |= ADC_CR2_ADON; 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; uint16_t rawRSSI = 0U;
bitband_t eoc = (bitband_t)BITBAND_PERIPH(&ADC1->SR, ADC_SR_EOS_Pos); 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); 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) { if (*eoc) {
// trigger next conversion // trigger next conversion
*adon = 1; *adon = 1;
#if defined(SEND_RSSI_DATA)
*rssi_adon = 1;
#endif
m_txBuffer.get(sample, control); m_txBuffer.get(sample, control);
DAC->DHR12R1 = sample; // Send the value to the DAC DAC->DHR12R1 = sample; // Send the value to the DAC