From 27f42c8522b2be10730c4ded075ff142377138be Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka <gniibe@fsij.org> Date: Tue, 14 Jul 2015 21:31:18 +0900 Subject: ADC settings are consolidated into the driver --- board/board-cq-starm.h | 2 -- board/board-fst-01-00.h | 2 -- board/board-fst-01.h | 8 -------- board/board-maple-mini.h | 2 -- board/board-stbee-mini.h | 8 -------- board/board-stbee.h | 8 -------- board/board-stm32-primer2.h | 2 -- board/board-stm8s-discovery.h | 2 -- 8 files changed, 34 deletions(-) (limited to 'board') diff --git a/board/board-cq-starm.h b/board/board-cq-starm.h index b771230..1519074 100644 --- a/board/board-cq-starm.h +++ b/board/board-cq-starm.h @@ -46,5 +46,3 @@ #define RCC_ENR_IOP_EN (RCC_APB2ENR_IOPAEN|RCC_APB2ENR_IOPCEN) #define RCC_RSTR_IOP_RST (RCC_APB2RSTR_IOPARST|RCC_APB2RSTR_IOPCRST) - -/* NeuG settings for ADC2 is default (PA0: Analog IN0, PA1: Analog IN1). */ diff --git a/board/board-fst-01-00.h b/board/board-fst-01-00.h index 8bfccc3..0e01b90 100644 --- a/board/board-fst-01-00.h +++ b/board/board-fst-01-00.h @@ -31,5 +31,3 @@ #define RCC_ENR_IOP_EN RCC_APB2ENR_IOPAEN #define RCC_RSTR_IOP_RST RCC_APB2RSTR_IOPARST - -/* NeuG settings for ADC2 is default (PA0: Analog IN0, PA1: Analog IN1). */ diff --git a/board/board-fst-01.h b/board/board-fst-01.h index c062133..56cd132 100644 --- a/board/board-fst-01.h +++ b/board/board-fst-01.h @@ -65,11 +65,3 @@ #define RCC_ENR_IOP_EN (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN) #define RCC_RSTR_IOP_RST (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST) - -/* NeuG settings for ADC2. */ -#define NEUG_ADC_SETTING2_SMPR1 0 -#define NEUG_ADC_SETTING2_SMPR2 ADC_SMPR2_SMP_AN0(ADC_SAMPLE_1P5) \ - | ADC_SMPR2_SMP_AN9(ADC_SAMPLE_1P5) -#define NEUG_ADC_SETTING2_SQR3 ADC_SQR3_SQ1_N(ADC_CHANNEL_IN0) \ - | ADC_SQR3_SQ2_N(ADC_CHANNEL_IN9) -#define NEUG_ADC_SETTING2_NUM_CHANNELS 2 diff --git a/board/board-maple-mini.h b/board/board-maple-mini.h index b8e1726..c288d2d 100644 --- a/board/board-maple-mini.h +++ b/board/board-maple-mini.h @@ -40,5 +40,3 @@ #define RCC_ENR_IOP_EN (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN) #define RCC_RSTR_IOP_RST (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST) - -/* NeuG settings for ADC2 is default (PA0: Analog IN0, PA1: Analog IN1). */ diff --git a/board/board-stbee-mini.h b/board/board-stbee-mini.h index b69863e..c8ee157 100644 --- a/board/board-stbee-mini.h +++ b/board/board-stbee-mini.h @@ -112,11 +112,3 @@ #define AFIO_MAPR_SOMETHING AFIO_MAPR_SWJ_CFG_DISABLE - -/* NeuG settings for ADC2. */ -#define NEUG_ADC_SETTING2_SMPR1 0 -#define NEUG_ADC_SETTING2_SMPR2 ADC_SMPR2_SMP_AN1(ADC_SAMPLE_1P5) \ - | ADC_SMPR2_SMP_AN2(ADC_SAMPLE_1P5) -#define NEUG_ADC_SETTING2_SQR3 ADC_SQR3_SQ1_N(ADC_CHANNEL_IN1) \ - | ADC_SQR3_SQ2_N(ADC_CHANNEL_IN2) -#define NEUG_ADC_SETTING2_NUM_CHANNELS 2 diff --git a/board/board-stbee.h b/board/board-stbee.h index 3ffc160..643d666 100644 --- a/board/board-stbee.h +++ b/board/board-stbee.h @@ -34,11 +34,3 @@ #define VAL_GPIO_LED_ODR 0xFFFFFFFF #define VAL_GPIO_LED_CRL 0x88862888 /* PD7...PD0 */ #define VAL_GPIO_LED_CRH 0x88888888 /* PD15...PD8 */ - -/* NeuG settings for ADC2. */ -#define NEUG_ADC_SETTING2_SMPR1 ADC_SMPR1_SMP_AN10(ADC_SAMPLE_1P5) \ - | ADC_SMPR1_SMP_AN11(ADC_SAMPLE_1P5) -#define NEUG_ADC_SETTING2_SMPR2 0 -#define NEUG_ADC_SETTING2_SQR3 ADC_SQR3_SQ1_N(ADC_CHANNEL_IN10) \ - | ADC_SQR3_SQ2_N(ADC_CHANNEL_IN11) -#define NEUG_ADC_SETTING2_NUM_CHANNELS 2 diff --git a/board/board-stm32-primer2.h b/board/board-stm32-primer2.h index 700f4ea..8967958 100644 --- a/board/board-stm32-primer2.h +++ b/board/board-stm32-primer2.h @@ -56,5 +56,3 @@ (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPDEN | RCC_APB2ENR_IOPEEN) #define RCC_RSTR_IOP_RST \ (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPDRST | RCC_APB2RSTR_IOPERST) - -/* NeuG settings for ADC2 is default (PA0: Analog IN0, PA1: Analog IN1). */ diff --git a/board/board-stm8s-discovery.h b/board/board-stm8s-discovery.h index 4e28662..002daca 100644 --- a/board/board-stm8s-discovery.h +++ b/board/board-stm8s-discovery.h @@ -48,8 +48,6 @@ #define RCC_RSTR_IOP_RST \ (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | RCC_APB2RSTR_AFIORST) -/* NeuG settings for ADC2 is default (PA0: Analog IN0, PA1: Analog IN1). */ - /* * Port B setup. * PB4 - (TIM3_CH1) input with pull-up -- cgit v1.2.3