zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 3605053. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5224 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2013-02-17 14:00:57 +00:00
parent 51deb0fa26
commit 0b9f09be24
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
os/hal/include/adc.h
View File

@ -228,18 +228,21 @@ typedef enum {
/* Invokes the callback passing the 2nd half of the buffer.*/ \ /* Invokes the callback passing the 2nd half of the buffer.*/ \
size_t half = (adcp)->depth / 2; \ size_t half = (adcp)->depth / 2; \
size_t half_index = half * (adcp)->grpp->num_channels; \ size_t half_index = half * (adcp)->grpp->num_channels; \
(adcp)->grpp->end_cb(adcp, (adcp)->samples + half_index, half); \ (adcp)->grpp->end_cb(adcp, (adcp)->samples + half_index, (adcp)->depth - half); \
} \ } \
else { \ else { \
/* Invokes the callback passing the whole buffer.*/ \ /* Invokes the callback passing the whole buffer.*/ \
(adcp)->grpp->end_cb(adcp, (adcp)->samples, (adcp)->depth); \ (adcp)->grpp->end_cb(adcp, (adcp)->samples, (adcp)->depth); \
} \ } \
if ((adcp)->state == ADC_COMPLETE) \ if ((adcp)->state == ADC_COMPLETE) { \
(adcp)->state = ADC_READY; \ (adcp)->state = ADC_READY; \
(adcp)->grpp = NULL; \
} \
} \ } \
else \ else { \
(adcp)->state = ADC_READY; \ (adcp)->state = ADC_READY; \
(adcp)->grpp = NULL; \ (adcp)->grpp = NULL; \
} \
_adc_wakeup_isr(adcp); \ _adc_wakeup_isr(adcp); \
} \ } \
} }

2
readme.txt
View File

@ -85,6 +85,8 @@
***************************************************************************** *****************************************************************************
*** 2.5.2 *** *** 2.5.2 ***
- FIX: Fixed bug prevents calling adcStartConversionI() within ISR (bug
3605053)(backported to 2.4.4).
- FIX: Fixed typo in platforms/STM32/can_lld.c (bug 3604657)(backported - FIX: Fixed typo in platforms/STM32/can_lld.c (bug 3604657)(backported
to 2.4.4). to 2.4.4).
- FIX: Added board files and demo for "WaveShare Open STM32F4 207I-C / 407I-C". - FIX: Added board files and demo for "WaveShare Open STM32F4 207I-C / 407I-C".