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 #750 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@9556 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Rocco Marco Guglielmi 2016-06-02 15:19:45 +00:00
parent 32a332911e
commit 68986d51aa
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/hal/ports/STM32/LLD/ADCv3/adc_lld.c
View File

@ -15,8 +15,8 @@
*/ */
/** /**
* @file STM32F3xx/adc_lld.c * @file STM32/LLD/ADCv3/adc_lld.c
* @brief STM32F3xx ADC subsystem low level driver source. * @brief STM32 ADC subsystem low level driver source.
* *
* @addtogroup ADC * @addtogroup ADC
* @{ * @{
@ -534,6 +534,7 @@ void adc_lld_init(void) {
ADC1_COMMON->CCR = STM32_ADC_ADC12_CLOCK_MODE | ADC_DMA_MDMA; ADC1_COMMON->CCR = STM32_ADC_ADC12_CLOCK_MODE | ADC_DMA_MDMA;
rccDisableADC12(FALSE); rccDisableADC12(FALSE);
#endif #endif
#endif
#if STM32_ADC_USE_ADC3 || STM32_ADC_USE_ADC4 #if STM32_ADC_USE_ADC3 || STM32_ADC_USE_ADC4
rccEnableADC34(FALSE); rccEnableADC34(FALSE);
rccResetADC34(); rccResetADC34();
@ -541,7 +542,6 @@ void adc_lld_init(void) {
rccDisableADC34(FALSE); rccDisableADC34(FALSE);
#endif #endif
#endif #endif
#endif
#if defined(STM32L4XX) #if defined(STM32L4XX)
rccEnableADC123(FALSE); rccEnableADC123(FALSE);
@ -705,7 +705,7 @@ void adc_lld_stop(ADCDriver *adcp) {
#endif #endif
#if STM32_ADC_USE_ADC2 #if STM32_ADC_USE_ADC2
if (&ADCD1 == adcp) { if (&ADCD2 == adcp) {
#if defined(STM32F3XX) #if defined(STM32F3XX)
/* Resetting CCR options except default ones.*/ /* Resetting CCR options except default ones.*/
adcp->adcc->CCR = STM32_ADC_ADC12_CLOCK_MODE | ADC_DMA_MDMA; adcp->adcc->CCR = STM32_ADC_ADC12_CLOCK_MODE | ADC_DMA_MDMA;
@ -715,7 +715,7 @@ void adc_lld_stop(ADCDriver *adcp) {
#endif #endif
#if STM32_ADC_USE_ADC3 #if STM32_ADC_USE_ADC3
if (&ADCD1 == adcp) { if (&ADCD3 == adcp) {
#if defined(STM32F3XX) #if defined(STM32F3XX)
/* Resetting CCR options except default ones.*/ /* Resetting CCR options except default ones.*/
adcp->adcc->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA; adcp->adcc->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA;
@ -725,7 +725,7 @@ void adc_lld_stop(ADCDriver *adcp) {
#endif #endif
#if STM32_ADC_USE_ADC4 #if STM32_ADC_USE_ADC4
if (&ADCD1 == adcp) { if (&ADCD4 == adcp) {
#if defined(STM32F3XX) #if defined(STM32F3XX)
/* Resetting CCR options except default ones.*/ /* Resetting CCR options except default ones.*/
adcp->adcc->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA; adcp->adcc->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA;

4
os/hal/ports/STM32/LLD/ADCv3/adc_lld.h
View File

@ -15,8 +15,8 @@
*/ */
/** /**
* @file STM32F3xx/adc_lld.h * @file STM32/LLD/ADCv3/adc_lld.h
* @brief STM32F3xx ADC subsystem low level driver header. * @brief STM32 ADC subsystem low level driver header.
* *
* @addtogroup ADC * @addtogroup ADC
* @{ * @{

3
readme.txt
View File

@ -73,7 +73,8 @@
***************************************************************************** *****************************************************************************
*** 16.1.5 *** *** 16.1.5 ***
- HAL: Fixed LTO settings and added board folder in STM32F4xx-USB_CDC demo - HAL: Fixed bug in STM32/ADCv3 (bug #750).
- HAL: Fixed OPT settings and added board folder in STM32F4xx-USB_CDC demo
(bug #749). (bug #749).
- HAL: Fixed wrong comments in STM32F4xx GPT demo (bug #748). - HAL: Fixed wrong comments in STM32F4xx GPT demo (bug #748).
- HAL: Fixed wrong comments and indents in STM32F7xx-GPT-ADC and - HAL: Fixed wrong comments and indents in STM32F7xx-GPT-ADC and