diff options
-rw-r--r-- | os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c | 10 | ||||
-rw-r--r-- | os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h | 2 | ||||
-rw-r--r-- | readme.txt | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c b/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c index 5a01134ef..a9f3240f1 100644 --- a/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c +++ b/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.c @@ -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;
diff --git a/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h b/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h index 2a295aead..d9ccea7cf 100644 --- a/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h +++ b/os/hal/ports/STM32/LLD/ADCv3/hal_adc_lld.h @@ -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
* @{
diff --git a/readme.txt b/readme.txt index 0cbd8181e..276e1ca1b 100644 --- a/readme.txt +++ b/readme.txt @@ -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).
|