mirror of https://github.com/rusefi/ChibiOS.git
Fixed Bug #750
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9557 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
e3b62eb4c3
commit
4121213741
|
@ -16,7 +16,7 @@
|
|||
|
||||
/**
|
||||
* @file ADCv3/hal_adc_lld.c
|
||||
* @brief STM32F3xx ADC subsystem low level driver source.
|
||||
* @brief STM32 ADC subsystem low level driver source.
|
||||
*
|
||||
* @addtogroup ADC
|
||||
* @{
|
||||
|
@ -534,6 +534,7 @@ void adc_lld_init(void) {
|
|||
ADC1_COMMON->CCR = STM32_ADC_ADC12_CLOCK_MODE | ADC_DMA_MDMA;
|
||||
rccDisableADC12(FALSE);
|
||||
#endif
|
||||
#endif
|
||||
#if STM32_ADC_USE_ADC3 || STM32_ADC_USE_ADC4
|
||||
rccEnableADC34(FALSE);
|
||||
rccResetADC34();
|
||||
|
@ -541,7 +542,6 @@ void adc_lld_init(void) {
|
|||
rccDisableADC34(FALSE);
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(STM32L4XX)
|
||||
rccEnableADC123(FALSE);
|
||||
|
@ -705,7 +705,7 @@ void adc_lld_stop(ADCDriver *adcp) {
|
|||
#endif
|
||||
|
||||
#if STM32_ADC_USE_ADC2
|
||||
if (&ADCD1 == adcp) {
|
||||
if (&ADCD2 == adcp) {
|
||||
#if defined(STM32F3XX)
|
||||
/* Resetting CCR options except default ones.*/
|
||||
adcp->adcc->CCR = STM32_ADC_ADC12_CLOCK_MODE | ADC_DMA_MDMA;
|
||||
|
@ -715,7 +715,7 @@ void adc_lld_stop(ADCDriver *adcp) {
|
|||
#endif
|
||||
|
||||
#if STM32_ADC_USE_ADC3
|
||||
if (&ADCD1 == adcp) {
|
||||
if (&ADCD3 == adcp) {
|
||||
#if defined(STM32F3XX)
|
||||
/* Resetting CCR options except default ones.*/
|
||||
adcp->adcc->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA;
|
||||
|
@ -725,7 +725,7 @@ void adc_lld_stop(ADCDriver *adcp) {
|
|||
#endif
|
||||
|
||||
#if STM32_ADC_USE_ADC4
|
||||
if (&ADCD1 == adcp) {
|
||||
if (&ADCD4 == adcp) {
|
||||
#if defined(STM32F3XX)
|
||||
/* Resetting CCR options except default ones.*/
|
||||
adcp->adcc->CCR = STM32_ADC_ADC34_CLOCK_MODE | ADC_DMA_MDMA;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
/**
|
||||
* @file ADCv3/hal_adc_lld.h
|
||||
* @brief STM32F3xx ADC subsystem low level driver header.
|
||||
* @brief STM32 ADC subsystem low level driver header.
|
||||
*
|
||||
* @addtogroup ADC
|
||||
* @{
|
||||
|
|
|
@ -114,7 +114,8 @@
|
|||
- RT: Merged RT4.
|
||||
- NIL: Merged NIL2.
|
||||
- NIL: Added STM32F7 demo.
|
||||
- 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)(backported to 3.0.6 and 16.1.5).
|
||||
- HAL: Fixed wrong comments in STM32F4xx GPT demo (bug #748)
|
||||
(backported to 2.6.10, 3.0.6 and 16.1.5).
|
||||
|
|
Loading…
Reference in New Issue