ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23 from cho45/gcc8

Browse source 
GCC8
This commit is contained in:
TT 2019-09-03 06:54:12 +09:00 committed by GitHub
parent 0f4c54eb0a 9b83a78a05
commit 9376816de9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
adc.c
View file

@ -31,13 +31,26 @@ void adc_init(void)
{ {
rccEnableADC1(FALSE); rccEnableADC1(FALSE);
/* Ensure flag states */
ADC1->IER = 0;
/* Calibration procedure.*/ /* Calibration procedure.*/
ADC->CCR = 0; ADC->CCR = 0;
if (ADC1->CR & ADC_CR_ADEN) {
ADC1->CR |= ~ADC_CR_ADDIS; /* Disable ADC */
}
while (ADC1->CR & ADC_CR_ADEN)
;
ADC1->CFGR1 &= ~ADC_CFGR1_DMAEN;
ADC1->CR |= ADC_CR_ADCAL; ADC1->CR |= ADC_CR_ADCAL;
while (ADC1->CR & ADC_CR_ADCAL) while (ADC1->CR & ADC_CR_ADCAL)
; ;
ADC1->CR = ADC_CR_ADEN; if (ADC1->ISR & ADC_ISR_ADRDY) {
ADC1->ISR |= ADC_ISR_ADRDY; /* clear ADRDY */
}
/* Enable ADC */
ADC1->CR |= ADC_CR_ADEN;
while (!(ADC1->ISR & ADC_ISR_ADRDY)) while (!(ADC1->ISR & ADC_ISR_ADRDY))
; ;
} }