aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os/hal/include/adc.h2
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/os/hal/include/adc.h b/os/hal/include/adc.h
index aee876978..48f9d9ff6 100644
--- a/os/hal/include/adc.h
+++ b/os/hal/include/adc.h
@@ -190,7 +190,6 @@ typedef enum {
} \
} \
else { \
- (adcp)->ad_grpp = NULL; \
/* End conversion.*/ \
adc_lld_stop_conversion(adcp); \
if ((adcp)->ad_grpp->acg_endcb == NULL) { \
@@ -212,6 +211,7 @@ typedef enum {
if ((adcp)->ad_state == ADC_COMPLETE) \
(adcp)->ad_state = ADC_READY; \
} \
+ (adcp)->ad_grpp = NULL; \
} \
}
diff --git a/readme.txt b/readme.txt
index 5dc2b2b6c..46c281fd0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -65,6 +65,8 @@
*****************************************************************************
*** 2.1.4 ***
+- FIX: Fixed failure in STM32 ADC driver when a linear buffer mode is used
+ (bug 3114696).
- FIX: Fixed PWM channels going to ACTIVE state when the pulse width is
set to zero in the STM32 PWM driver (bug 3114481)(backported to 2.0.8).
- FIX: Fixed PWM channels return to IDLE state in STM32 PWM driver (bug