Fixed Bug #751
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9564 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
f3c38b36f5
commit
f558772bb8
|
@ -230,8 +230,12 @@ typedef enum {
|
||||||
(adcp)->grpp->error_cb(adcp, err); \
|
(adcp)->grpp->error_cb(adcp, err); \
|
||||||
if ((adcp)->state == ADC_ERROR) \
|
if ((adcp)->state == ADC_ERROR) \
|
||||||
(adcp)->state = ADC_READY; \
|
(adcp)->state = ADC_READY; \
|
||||||
|
(adcp)->grpp = NULL; \
|
||||||
|
} \
|
||||||
|
else { \
|
||||||
|
(adcp)->state = ADC_READY; \
|
||||||
|
(adcp)->grpp = NULL; \
|
||||||
} \
|
} \
|
||||||
(adcp)->grpp = NULL; \
|
|
||||||
_adc_timeout_isr(adcp); \
|
_adc_timeout_isr(adcp); \
|
||||||
}
|
}
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
|
@ -114,6 +114,8 @@
|
||||||
- RT: Merged RT4.
|
- RT: Merged RT4.
|
||||||
- NIL: Merged NIL2.
|
- NIL: Merged NIL2.
|
||||||
- NIL: Added STM32F7 demo.
|
- 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 bug in STM32/ADCv3 (bug #750).
|
||||||
- HAL: Fixed OPT settings and added board folder in STM32F4xx-USB_CDC demo
|
- HAL: Fixed OPT settings and added board folder in STM32F4xx-USB_CDC demo
|
||||||
(bug #749)(backported to 3.0.6 and 16.1.5).
|
(bug #749)(backported to 3.0.6 and 16.1.5).
|
||||||
|
|
Loading…
Reference in New Issue