diff options
| author | Rocco Marco Guglielmi <roccomarco.guglielmi@live.com> | 2016-06-03 10:54:37 +0000 |
|---|---|---|
| committer | Rocco Marco Guglielmi <roccomarco.guglielmi@live.com> | 2016-06-03 10:54:37 +0000 |
| commit | f558772bb8f099bdab54fa4f431a9536937d1e3d (patch) | |
| tree | 1aadefac9184a1dc5f5d493023af162f36fbf90d | |
| parent | f3c38b36f5e3039ef78736f568105a703c1046b0 (diff) | |
| download | ChibiOS-f558772bb8f099bdab54fa4f431a9536937d1e3d.tar.gz ChibiOS-f558772bb8f099bdab54fa4f431a9536937d1e3d.tar.bz2 ChibiOS-f558772bb8f099bdab54fa4f431a9536937d1e3d.zip | |
Fixed Bug #751
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9564 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/include/hal_adc.h | 6 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/os/hal/include/hal_adc.h b/os/hal/include/hal_adc.h index 7b93851c5..527821245 100644 --- a/os/hal/include/hal_adc.h +++ b/os/hal/include/hal_adc.h @@ -230,8 +230,12 @@ typedef enum { (adcp)->grpp->error_cb(adcp, err); \
if ((adcp)->state == ADC_ERROR) \
(adcp)->state = ADC_READY; \
+ (adcp)->grpp = NULL; \
+ } \
+ else { \
+ (adcp)->state = ADC_READY; \
+ (adcp)->grpp = NULL; \
} \
- (adcp)->grpp = NULL; \
_adc_timeout_isr(adcp); \
}
/** @} */
diff --git a/readme.txt b/readme.txt index 276e1ca1b..f3df0aa41 100644 --- a/readme.txt +++ b/readme.txt @@ -114,6 +114,8 @@ - RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
+- HAL: Fixed wrong conditional branches in _adc_isr_error_code (bug #751)
+ (backported to 2.6.10, 3.0.6 and 16.1.5).
- 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).
|