andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.2.x@6030 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2013-07-27 07:57:43 +00:00
parent b8de4f6aee
commit c807840cdc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,8 +187,8 @@ typedef enum {
if ((adcp)->ad_depth > 1) { \ if ((adcp)->ad_depth > 1) { \
/* Invokes the callback passing the 2nd half of the buffer.*/ \ /* Invokes the callback passing the 2nd half of the buffer.*/ \
size_t half = (adcp)->ad_depth / 2; \ size_t half = (adcp)->ad_depth / 2; \
size_t half_index = half * (adcp)->grpp->acg_num_channels; \ size_t half_index = half * (adcp)->ad_grpp->acg_num_channels; \
(adcp)->grpp->acg_endcb(adcp, \ (adcp)->ad_grpp->acg_endcb(adcp, \
(adcp)->ad_samples + half_index, half); \ (adcp)->ad_samples + half_index, half); \
} \ } \
else { \ else { \
@ -206,8 +206,8 @@ typedef enum {
if ((adcp)->ad_depth > 1) { \ if ((adcp)->ad_depth > 1) { \
/* Invokes the callback passing the 2nd half of the buffer.*/ \ /* Invokes the callback passing the 2nd half of the buffer.*/ \
size_t half = (adcp)->ad_depth / 2; \ size_t half = (adcp)->ad_depth / 2; \
size_t half_index = half * (adcp)->grpp->acg_num_channels; \ size_t half_index = half * (adcp)->ad_grpp->acg_num_channels; \
(adcp)->grpp->acg_endcb(adcp, \ (adcp)->ad_grpp->acg_endcb(adcp, \
(adcp)->ad_samples + half_index, half); \ (adcp)->ad_samples + half_index, half); \
} \ } \
else { \ else { \

2
os/hal/platforms/STM32/adc_lld.c
View File

@ -210,7 +210,7 @@ void adc_lld_start_conversion(ADCDriver *adcp) {
else else
n = (uint32_t)grpp->acg_num_channels; n = (uint32_t)grpp->acg_num_channels;
dmaChannelSetup(adcp->ad_dmachp, n, adcp->ad_samples, ccr); dmaChannelSetup(adcp->ad_dmachp, n, adcp->ad_samples, ccr);
dmaChannelEnable(adcp->dmastp); dmaChannelEnable(adcp->ad_dmachp);
/* ADC setup.*/ /* ADC setup.*/
adcp->ad_adc->CR1 = grpp->acg_cr1 | ADC_CR1_SCAN; adcp->ad_adc->CR1 = grpp->acg_cr1 | ADC_CR1_SCAN;