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

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3501 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2011-11-16 18:58:09 +00:00
parent cef04f5f4b
commit 759a95a23a
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testhal/STM32F1xx/ADC/main.c
View File

@ -53,8 +53,8 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) {
/* /*
* ADC conversion group. * ADC conversion group.
* Mode: Linear buffer, 16 samples of 8 channels, SW triggered. * Mode: Linear buffer, 8 samples of 1 channel, SW triggered.
* Channels: IN10, IN11, IN10, IN11, IN10, IN11, Sensor, VRef. * Channels: IN10.
*/ */
static const ADCConversionGroup adcgrpcfg1 = { static const ADCConversionGroup adcgrpcfg1 = {
FALSE, FALSE,
@ -80,9 +80,8 @@ static const ADCConversionGroup adcgrpcfg2 = {
adccallback, adccallback,
adcerrorcallback, adcerrorcallback,
0, ADC_CR2_TSVREFE, /* CR1, CR2 */ 0, ADC_CR2_TSVREFE, /* CR1, CR2 */
ADC_SMPR1_SMP_AN10(ADC_SAMPLE_41P5) | ADC_SMPR1_SMP_AN11(ADC_SAMPLE_41P5) | ADC_SMPR1_SMP_AN10(ADC_SAMPLE_41P5) |
ADC_SMPR1_SMP_SENSOR(ADC_SAMPLE_239P5) | ADC_SMPR1_SMP_SENSOR(ADC_SAMPLE_239P5) | ADC_SMPR1_SMP_VREF(ADC_SAMPLE_239P5),
ADC_SMPR1_SMP_VREF(ADC_SAMPLE_239P5),
0, /* SMPR2 */ 0, /* SMPR2 */
ADC_SQR1_NUM_CH(ADC_GRP2_NUM_CHANNELS), ADC_SQR1_NUM_CH(ADC_GRP2_NUM_CHANNELS),
ADC_SQR2_SQ8_N(ADC_CHANNEL_SENSOR) | ADC_SQR2_SQ7_N(ADC_CHANNEL_VREFINT), ADC_SQR2_SQ8_N(ADC_CHANNEL_SENSOR) | ADC_SQR2_SQ7_N(ADC_CHANNEL_VREFINT),

2
testhal/STM32F4xx/ADC/main.c
View File

@ -53,7 +53,7 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) {
/* /*
* ADC conversion group. * ADC conversion group.
* Mode: Linear buffer, 16 samples of 1 channel, SW triggered. * Mode: Linear buffer, 8 samples of 1 channel, SW triggered.
* Channels: IN10. * Channels: IN10.
*/ */
static const ADCConversionGroup adcgrpcfg1 = { static const ADCConversionGroup adcgrpcfg1 = {

8
testhal/STM32L1xx/ADC/main.c
View File

@ -53,8 +53,8 @@ static void adcerrorcallback(ADCDriver *adcp, adcerror_t err) {
/* /*
* ADC conversion group. * ADC conversion group.
* Mode: Linear buffer, 16 samples of 8 channels, SW triggered. * Mode: Linear buffer, 8 samples of 1 channel, SW triggered.
* Channels: IN10, IN11, IN10, IN11, IN10, IN11, Sensor, VRef. * Channels: IN10.
*/ */
static const ADCConversionGroup adcgrpcfg1 = { static const ADCConversionGroup adcgrpcfg1 = {
FALSE, FALSE,
@ -82,8 +82,8 @@ static const ADCConversionGroup adcgrpcfg2 = {
adcerrorcallback, adcerrorcallback,
0, 0, /* CR1, CR2 */ 0, 0, /* CR1, CR2 */
0, /* SMPR1 */ 0, /* SMPR1 */
ADC_SMPR2_SMP_AN10(ADC_SAMPLE_48) | ADC_SMPR2_SMP_SENSOR(ADC_SAMPLE_192) | ADC_SMPR2_SMP_AN11(ADC_SAMPLE_48) | ADC_SMPR2_SMP_AN10(ADC_SAMPLE_48) |
ADC_SMPR2_SMP_VREF(ADC_SAMPLE_192), ADC_SMPR2_SMP_SENSOR(ADC_SAMPLE_192) | ADC_SMPR2_SMP_VREF(ADC_SAMPLE_192),
0, /* SMPR3 */ 0, /* SMPR3 */
ADC_SQR1_NUM_CH(ADC_GRP2_NUM_CHANNELS), ADC_SQR1_NUM_CH(ADC_GRP2_NUM_CHANNELS),
0, 0, /* SQR2, SQR3 */ 0, 0, /* SQR2, SQR3 */