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/trunk@5500 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2013-03-24 15:16:39 +00:00
parent ca3e1fceff
commit 9831a1ec8f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/platforms/STM32F37x/adc_lld.h
View File

@ -661,8 +661,8 @@ struct ADCDriver {
#define SDADC_CONFR_GAIN_0P5X (7U << 20) #define SDADC_CONFR_GAIN_0P5X (7U << 20)
#define SDADC_CONFR_SE_MASK (3U << 26) #define SDADC_CONFR_SE_MASK (3U << 26)
#define SDADC_CONFR_SE_DIFF (0U << 26) #define SDADC_CONFR_SE_DIFF (0U << 26)
#define SDADC_CONFR_SE_SE_OFF (1U << 26) #define SDADC_CONFR_SE_OFFSET (1U << 26)
#define SDADC_CONFR_SE_SE_ZV (3U << 26) #define SDADC_CONFR_SE_ZERO_VOLT (3U << 26)
#define SDADC_CONFR_COMMON_MASK (3U << 30) #define SDADC_CONFR_COMMON_MASK (3U << 30)
#define SDADC_CONFR_COMMON_VSSSD (0U << 30) #define SDADC_CONFR_COMMON_VSSSD (0U << 30)
#define SDADC_CONFR_COMMON_VDDSD2 (1U << 30) #define SDADC_CONFR_COMMON_VDDSD2 (1U << 30)

2
testhal/STM32F37x/SDADC/Makefile
View File

@ -5,7 +5,7 @@
# Compiler options here. # Compiler options here.
ifeq ($(USE_OPT),) ifeq ($(USE_OPT),)
USE_OPT = -O0 -ggdb -fomit-frame-pointer -falign-functions=16 USE_OPT = -O2 -ggdb -fomit-frame-pointer -falign-functions=16
endif endif
# C specific options here (added to USE_OPT). # C specific options here (added to USE_OPT).

6
testhal/STM32F37x/SDADC/main.c
View File

@ -54,7 +54,7 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) {
/* /*
* ADC conversion group. * ADC conversion group.
* Mode: Linear buffer, 8 samples of 1 channel, SW triggered. * Mode: Linear buffer, 8 samples of 1 channel, SW triggered.
* Channels: ADC_IN6P. * Channels: ADC_IN5P.
*/ */
static const ADCConversionGroup adcgrpcfg1 = { static const ADCConversionGroup adcgrpcfg1 = {
FALSE, FALSE,
@ -63,14 +63,14 @@ static const ADCConversionGroup adcgrpcfg1 = {
adcerrorcallback, adcerrorcallback,
.u.sdadc = { .u.sdadc = {
SDADC_CR2_JSWSTART, /* CR2 */ SDADC_CR2_JSWSTART, /* CR2 */
SDADC_JCHGR_CH(6), /* JCHGR */ SDADC_JCHGR_CH(5), /* JCHGR */
{ /* CONFxR[3]*/ { /* CONFxR[3]*/
SDADC_CONFR_GAIN_1X | SDADC_CONFR_SE_DIFF | SDADC_CONFR_COMMON_VSSSD, SDADC_CONFR_GAIN_1X | SDADC_CONFR_SE_DIFF | SDADC_CONFR_COMMON_VSSSD,
0, 0,
0 0
}, },
{ /* CONFCHR[2]*/ { /* CONFCHR[2]*/
SDADC_CONFCHR1_CH6(0), SDADC_CONFCHR1_CH5(0),
0 0
} }
} }