andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #479. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6800 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2014-03-22 11:32:17 +00:00
parent c90c328606
commit d90b1f5b37
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os/hal/ports/STM32/STM32F37x/adc_lld.c
View File

@ -427,7 +427,7 @@ void adc_lld_start(ADCDriver *adcp) {
(void *)adcp); (void *)adcp);
osalDbgAssert(!b, "stream already allocated"); osalDbgAssert(!b, "stream already allocated");
dmaStreamSetPeripheral(adcp->dmastp, &SDADC2->JDATAR); dmaStreamSetPeripheral(adcp->dmastp, &SDADC2->JDATAR);
rccEnableSDADC1(FALSE); rccEnableSDADC2(FALSE);
PWR->CR |= PWR_CR_SDADC2EN; PWR->CR |= PWR_CR_SDADC2EN;
adcp->sdadc->CR2 = 0; adcp->sdadc->CR2 = 0;
adcp->sdadc->CR1 = (adcp->config->cr1 | SDADC_ENFORCED_CR1_FLAGS) & adcp->sdadc->CR1 = (adcp->config->cr1 | SDADC_ENFORCED_CR1_FLAGS) &
@ -444,7 +444,7 @@ void adc_lld_start(ADCDriver *adcp) {
(void *)adcp); (void *)adcp);
osalDbgAssert(!b, "stream already allocated"); osalDbgAssert(!b, "stream already allocated");
dmaStreamSetPeripheral(adcp->dmastp, &SDADC3->JDATAR); dmaStreamSetPeripheral(adcp->dmastp, &SDADC3->JDATAR);
rccEnableSDADC1(FALSE); rccEnableSDADC2(FALSE);
PWR->CR |= PWR_CR_SDADC3EN; PWR->CR |= PWR_CR_SDADC3EN;
adcp->sdadc->CR2 = 0; adcp->sdadc->CR2 = 0;
adcp->sdadc->CR1 = (adcp->config->cr1 | SDADC_ENFORCED_CR1_FLAGS) & adcp->sdadc->CR1 = (adcp->config->cr1 | SDADC_ENFORCED_CR1_FLAGS) &
@ -583,11 +583,16 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
adcp->sdadc->CONFCHR1 = grpp->u.sdadc.confchr[0]; adcp->sdadc->CONFCHR1 = grpp->u.sdadc.confchr[0];
adcp->sdadc->CONFCHR2 = grpp->u.sdadc.confchr[1]; adcp->sdadc->CONFCHR2 = grpp->u.sdadc.confchr[1];
/* SDADC trigger modes, this write must be performed when
SDADC_CR1_INIT=1.*/
adcp->sdadc->CR2 = cr2;
/* Leaving initialization mode.*/ /* Leaving initialization mode.*/
adcp->sdadc->CR1 &= ~SDADC_CR1_INIT; adcp->sdadc->CR1 &= ~SDADC_CR1_INIT;
/* SDADC conversion start, the start is performed using the method /* Special case, if SDADC_CR2_JSWSTART is specified it has to be
specified in the CR2 configuration, usually SDADC_CR2_JSWSTART.*/ written after SDADC_CR1_INIT has been set to zero. Just a write is
performed, any other bit is ingore if not in initialization mode.*/
adcp->sdadc->CR2 = cr2; adcp->sdadc->CR2 = cr2;
} }
#endif /* STM32_ADC_USE_SDADC */ #endif /* STM32_ADC_USE_SDADC */

1
testhal/STM32F37x/SDADC/.cproject
View File

@ -48,4 +48,5 @@
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
<storageModule moduleId="refreshScope"/>
</cproject> </cproject>