stm32: ADC peripheral style 1 header unification
This pulls out all the common header definitions for the F1, L1, F4 and F37x parts. It's verified against the datasheet for F2 as well, but we don't have any good F2 test boards or any support for that yet. (The F2 header would be _exactly_ the same as the F4 header, so it's a target for a future round of unification, not this one) Tested with f1, f4 and l1 examples from the examples repository.
This commit is contained in:
Karl Palsson
committed by
Karl Palsson
Karl Palsson
parent
06f11df2a9
commit
3eaeaf693c
@@ -38,177 +38,52 @@ LGPL License Terms @ref lgpl_license
|
||||
#ifndef LIBOPENCM3_ADC_H
|
||||
#define LIBOPENCM3_ADC_H
|
||||
|
||||
#include <libopencm3/stm32/memorymap.h>
|
||||
#include <libopencm3/cm3/common.h>
|
||||
#include <libopencm3/stm32/memorymap.h>
|
||||
#include <libopencm3/stm32/common/adc_common_v1.h>
|
||||
|
||||
/* --- Convenience macros -------------------------------------------------- */
|
||||
|
||||
/* ADC port base addresses (for convenience) */
|
||||
/****************************************************************************/
|
||||
/** @defgroup adc_reg_base ADC register base addresses
|
||||
@ingroup adc_defines
|
||||
|
||||
@{*/
|
||||
#define ADC1 ADC1_BASE
|
||||
#define ADC2 ADC2_BASE
|
||||
#define ADC3 ADC3_BASE
|
||||
/**@}*/
|
||||
|
||||
/* --- ADC registers ------------------------------------------------------- */
|
||||
|
||||
/* ADC status register (ADC_SR) */
|
||||
#define ADC_SR(block) MMIO32(block + 0x00)
|
||||
#define ADC1_SR ADC_SR(ADC1)
|
||||
#define ADC2_SR ADC_SR(ADC2)
|
||||
#define ADC3_SR ADC_SR(ADC3)
|
||||
|
||||
/* ADC control register 1 (ADC_CR1) */
|
||||
#define ADC_CR1(block) MMIO32(block + 0x04)
|
||||
#define ADC1_CR1 ADC_CR1(ADC1)
|
||||
#define ADC2_CR1 ADC_CR1(ADC2)
|
||||
#define ADC3_CR1 ADC_CR1(ADC3)
|
||||
|
||||
/* ADC control register 2 (ADC_CR2) */
|
||||
#define ADC_CR2(block) MMIO32(block + 0x08)
|
||||
#define ADC1_CR2 ADC_CR2(ADC1)
|
||||
#define ADC2_CR2 ADC_CR2(ADC2)
|
||||
#define ADC3_CR2 ADC_CR2(ADC3)
|
||||
|
||||
/* ADC sample time register 1 (ADC_SMPR1) */
|
||||
#define ADC_SMPR1(block) MMIO32(block + 0x0c)
|
||||
#define ADC1_SMPR1 ADC_SMPR1(ADC1)
|
||||
#define ADC2_SMPR1 ADC_SMPR1(ADC2)
|
||||
#define ADC3_SMPR1 ADC_SMPR1(ADC3)
|
||||
|
||||
/* ADC sample time register 2 (ADC_SMPR2) */
|
||||
#define ADC_SMPR2(block) MMIO32(block + 0x10)
|
||||
#define ADC1_SMPR2 ADC_SMPR2(ADC1)
|
||||
#define ADC2_SMPR2 ADC_SMPR2(ADC2)
|
||||
#define ADC3_SMPR2 ADC_SMPR2(ADC3)
|
||||
|
||||
/* ADC injected channel data offset register x (ADC_JOFRx) (x=1..4) */
|
||||
#define ADC_JOFR1(block) MMIO32(block + 0x14)
|
||||
#define ADC_JOFR2(block) MMIO32(block + 0x18)
|
||||
#define ADC_JOFR3(block) MMIO32(block + 0x1c)
|
||||
#define ADC_JOFR4(block) MMIO32(block + 0x20)
|
||||
#define ADC1_JOFR1 ADC_JOFR1(ADC1)
|
||||
#define ADC2_JOFR1 ADC_JOFR1(ADC2)
|
||||
#define ADC3_JOFR1 ADC_JOFR1(ADC3)
|
||||
#define ADC1_JOFR2 ADC_JOFR2(ADC1)
|
||||
#define ADC2_JOFR2 ADC_JOFR2(ADC2)
|
||||
#define ADC3_JOFR2 ADC_JOFR2(ADC3)
|
||||
#define ADC1_JOFR3 ADC_JOFR3(ADC1)
|
||||
#define ADC2_JOFR3 ADC_JOFR3(ADC2)
|
||||
#define ADC3_JOFR3 ADC_JOFR3(ADC3)
|
||||
#define ADC1_JOFR4 ADC_JOFR4(ADC1)
|
||||
#define ADC2_JOFR4 ADC_JOFR4(ADC2)
|
||||
#define ADC3_JOFR4 ADC_JOFR4(ADC3)
|
||||
|
||||
/* ADC watchdog high threshold register (ADC_HTR) */
|
||||
#define ADC_HTR(block) MMIO32(block + 0x24)
|
||||
#define ADC1_HTR ADC_HTR(ADC1)
|
||||
#define ADC2_HTR ADC_HTR(ADC2)
|
||||
#define ADC3_HTR ADC_HTR(ADC3)
|
||||
|
||||
/* ADC watchdog low threshold register (ADC_LTR) */
|
||||
#define ADC_LTR(block) MMIO32(block + 0x28)
|
||||
#define ADC1_LTR ADC_LTR(ADC1_BASE)
|
||||
#define ADC2_LTR ADC_LTR(ADC2_BASE)
|
||||
#define ADC3_LTR ADC_LTR(ADC3_BASE)
|
||||
|
||||
/* ADC regular sequence register 1 (ADC_SQR1) */
|
||||
#define ADC_SQR1(block) MMIO32(block + 0x2c)
|
||||
#define ADC1_SQR1 ADC_SQR1(ADC1)
|
||||
#define ADC2_SQR1 ADC_SQR1(ADC2)
|
||||
#define ADC3_SQR1 ADC_SQR1(ADC3)
|
||||
|
||||
/* ADC regular sequence register 2 (ADC_SQR2) */
|
||||
#define ADC_SQR2(block) MMIO32(block + 0x30)
|
||||
#define ADC1_SQR2 ADC_SQR2(ADC1)
|
||||
#define ADC2_SQR2 ADC_SQR2(ADC2)
|
||||
#define ADC3_SQR2 ADC_SQR2(ADC3)
|
||||
|
||||
/* ADC regular sequence register 3 (ADC_SQR3) */
|
||||
#define ADC_SQR3(block) MMIO32(block + 0x34)
|
||||
#define ADC1_SQR3 ADC_SQR3(ADC1)
|
||||
#define ADC2_SQR3 ADC_SQR3(ADC2)
|
||||
#define ADC3_SQR3 ADC_SQR3(ADC3)
|
||||
|
||||
/* ADC injected sequence register (ADC_JSQR) */
|
||||
#define ADC_JSQR(block) MMIO32(block + 0x38)
|
||||
#define ADC1_JSQR ADC_JSQR(ADC1_BASE)
|
||||
#define ADC2_JSQR ADC_JSQR(ADC2_BASE)
|
||||
#define ADC3_JSQR ADC_JSQR(ADC3_BASE)
|
||||
|
||||
/* ADC injected data register x (ADC_JDRx) (x=1..4) */
|
||||
#define ADC_JDR1(block) MMIO32(block + 0x3c)
|
||||
#define ADC_JDR2(block) MMIO32(block + 0x40)
|
||||
#define ADC_JDR3(block) MMIO32(block + 0x44)
|
||||
#define ADC_JDR4(block) MMIO32(block + 0x48)
|
||||
#define ADC1_JDR1 ADC_JDR1(ADC1)
|
||||
#define ADC2_JDR1 ADC_JDR1(ADC2)
|
||||
#define ADC3_JDR1 ADC_JDR1(ADC3)
|
||||
#define ADC1_JDR2 ADC_JDR2(ADC1)
|
||||
#define ADC2_JDR2 ADC_JDR2(ADC2)
|
||||
#define ADC3_JDR2 ADC_JDR2(ADC3)
|
||||
#define ADC1_JDR3 ADC_JDR3(ADC1)
|
||||
#define ADC2_JDR3 ADC_JDR3(ADC2)
|
||||
#define ADC3_JDR3 ADC_JDR3(ADC3)
|
||||
#define ADC1_JDR4 ADC_JDR4(ADC1)
|
||||
#define ADC2_JDR4 ADC_JDR4(ADC2)
|
||||
#define ADC3_JDR4 ADC_JDR4(ADC3)
|
||||
|
||||
/* ADC regular data register (ADC_DR) */
|
||||
#define ADC_DR(block) MMIO32(block + 0x4c)
|
||||
#define ADC1_DR ADC_DR(ADC1)
|
||||
#define ADC2_DR ADC_DR(ADC2)
|
||||
#define ADC3_DR ADC_DR(ADC3)
|
||||
|
||||
/* --- ADC Channels ------------------------------------------------------- */
|
||||
#define ADC_CHANNEL_TEMP ADC_CHANNEL16
|
||||
#define ADC_CHANNEL_VREFINT ADC_CHANNEL17
|
||||
|
||||
/****************************************************************************/
|
||||
/** @defgroup adc_channel ADC Channel Numbers
|
||||
@ingroup adc_defines
|
||||
|
||||
@{*/
|
||||
#define ADC_CHANNEL0 0x00
|
||||
#define ADC_CHANNEL1 0x01
|
||||
#define ADC_CHANNEL2 0x02
|
||||
#define ADC_CHANNEL3 0x03
|
||||
#define ADC_CHANNEL4 0x04
|
||||
#define ADC_CHANNEL5 0x05
|
||||
#define ADC_CHANNEL6 0x06
|
||||
#define ADC_CHANNEL7 0x07
|
||||
#define ADC_CHANNEL8 0x08
|
||||
#define ADC_CHANNEL9 0x09
|
||||
#define ADC_CHANNEL10 0x0A
|
||||
#define ADC_CHANNEL11 0x0B
|
||||
#define ADC_CHANNEL12 0x0C
|
||||
#define ADC_CHANNEL13 0x0D
|
||||
#define ADC_CHANNEL14 0x0E
|
||||
#define ADC_CHANNEL15 0x0F
|
||||
#define ADC_CHANNEL16 0x10
|
||||
#define ADC_CHANNEL17 0x11
|
||||
/**@}*/
|
||||
#define ADC_MASK 0x1F
|
||||
#define ADC_SHIFT 0
|
||||
|
||||
/* --- ADC_SR values ------------------------------------------------------- */
|
||||
|
||||
#define ADC_SR_STRT (1 << 4)
|
||||
#define ADC_SR_JSTRT (1 << 3)
|
||||
#define ADC_SR_JEOC (1 << 2)
|
||||
#define ADC_SR_EOC (1 << 1)
|
||||
#define ADC_SR_AWD (1 << 0)
|
||||
|
||||
/* --- ADC_CR1 values ------------------------------------------------------ */
|
||||
|
||||
/* AWDEN: Analog watchdog enable on regular channels */
|
||||
#define ADC_CR1_AWDEN (1 << 23)
|
||||
|
||||
/* JAWDEN: Analog watchdog enable on injected channels */
|
||||
#define ADC_CR1_JAWDEN (1 << 22)
|
||||
|
||||
/* Note: Bits [21:20] are reserved, and must be kept at reset value. */
|
||||
|
||||
/* DUALMOD[3:0]: Dual mode selection. (ADC1 only) */
|
||||
@@ -254,82 +129,6 @@ LGPL License Terms @ref lgpl_license
|
||||
#define ADC_CR1_DUALMOD_MASK (0xF << 16)
|
||||
#define ADC_CR1_DUALMOD_SHIFT 16
|
||||
|
||||
/* DISCNUM[2:0]: Discontinuous mode channel count. */
|
||||
/****************************************************************************/
|
||||
/** @defgroup adc_cr1_discnum ADC Number of channels in discontinuous mode.
|
||||
@ingroup adc_defines
|
||||
|
||||
@{*/
|
||||
#define ADC_CR1_DISCNUM_1CHANNELS (0x0 << 13)
|
||||
#define ADC_CR1_DISCNUM_2CHANNELS (0x1 << 13)
|
||||
#define ADC_CR1_DISCNUM_3CHANNELS (0x2 << 13)
|
||||
#define ADC_CR1_DISCNUM_4CHANNELS (0x3 << 13)
|
||||
#define ADC_CR1_DISCNUM_5CHANNELS (0x4 << 13)
|
||||
#define ADC_CR1_DISCNUM_6CHANNELS (0x5 << 13)
|
||||
#define ADC_CR1_DISCNUM_7CHANNELS (0x6 << 13)
|
||||
#define ADC_CR1_DISCNUM_8CHANNELS (0x7 << 13)
|
||||
/**@}*/
|
||||
#define ADC_CR1_DISCNUM_MASK (0x7 << 13)
|
||||
#define ADC_CR1_DISCNUM_SHIFT 13
|
||||
|
||||
/* JDISCEN: */ /** Discontinuous mode on injected channels. */
|
||||
#define ADC_CR1_JDISCEN (1 << 12)
|
||||
|
||||
/* DISCEN: */ /** Discontinuous mode on regular channels. */
|
||||
#define ADC_CR1_DISCEN (1 << 11)
|
||||
|
||||
/* JAUTO: */ /** Automatic Injection Group conversion. */
|
||||
#define ADC_CR1_JAUTO (1 << 10)
|
||||
|
||||
/* AWDSGL: */ /** Enable the watchdog on a single channel in scan mode. */
|
||||
#define ADC_CR1_AWDSGL (1 << 9)
|
||||
|
||||
/* SCAN: */ /** Scan mode. */
|
||||
#define ADC_CR1_SCAN (1 << 8)
|
||||
|
||||
/* JEOCIE: */ /** Interrupt enable for injected channels. */
|
||||
#define ADC_CR1_JEOCIE (1 << 7)
|
||||
|
||||
/* AWDIE: */ /** Analog watchdog interrupt enable. */
|
||||
#define ADC_CR1_AWDIE (1 << 6)
|
||||
|
||||
/* EOCIE: */ /** Interrupt enable EOC. */
|
||||
#define ADC_CR1_EOCIE (1 << 5)
|
||||
|
||||
/* AWDCH[4:0]: Analog watchdog channel bits. (Up to 17 other values reserved) */
|
||||
/* Notes:
|
||||
* ADC1: Analog channel 16 and 17 are internally connected to the temperature
|
||||
* sensor and V_REFINT, respectively.
|
||||
* ADC2: Analog channel 16 and 17 are internally connected to V_SS.
|
||||
* ADC3: Analog channel 9, 14, 15, 16 and 17 are internally connected to V_SS.
|
||||
*/
|
||||
/****************************************************************************/
|
||||
/* ADC_CR1 AWDCH[4:0] ADC watchdog channel */
|
||||
/** @defgroup adc_watchdog_channel ADC watchdog channel
|
||||
@ingroup adc_defines
|
||||
|
||||
@{*/
|
||||
#define ADC_CR1_AWDCH_CHANNEL0 (0x00 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL1 (0x01 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL2 (0x02 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL3 (0x03 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL4 (0x04 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL5 (0x05 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL6 (0x06 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL7 (0x07 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL8 (0x08 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL9 (0x09 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL10 (0x0A << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL11 (0x0B << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL12 (0x0C << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL13 (0x0D << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL14 (0x0E << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL15 (0x0F << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL16 (0x10 << 0)
|
||||
#define ADC_CR1_AWDCH_CHANNEL17 (0x11 << 0)
|
||||
/**@}*/
|
||||
#define ADC_CR1_AWDCH_MASK (0x1F << 0)
|
||||
#define ADC_CR1_AWDCH_SHIFT 0
|
||||
|
||||
/* --- ADC_CR2 values ------------------------------------------------------ */
|
||||
|
||||
@@ -595,35 +394,6 @@ and ADC2
|
||||
#define ADC_SQR3_SQ3_MSK (0x1f << ADC_SQR3_SQ3_LSB)
|
||||
#define ADC_SQR3_SQ2_MSK (0x1f << ADC_SQR3_SQ2_LSB)
|
||||
#define ADC_SQR3_SQ1_MSK (0x1f << ADC_SQR3_SQ1_LSB)
|
||||
/* --- ADC_JSQR values ----------------------------------------------------- */
|
||||
|
||||
#define ADC_JSQR_JL_LSB 20
|
||||
#define ADC_JSQR_JSQ4_LSB 15
|
||||
#define ADC_JSQR_JSQ3_LSB 10
|
||||
#define ADC_JSQR_JSQ2_LSB 5
|
||||
#define ADC_JSQR_JSQ1_LSB 0
|
||||
|
||||
/* JL[2:0]: Discontinuous mode channel count injected channels. */
|
||||
/****************************************************************************/
|
||||
/** @defgroup adc_jsqr_jl ADC Number of channels in discontinuous mode from
|
||||
injected channels.
|
||||
@ingroup adc_defines
|
||||
|
||||
@{*/
|
||||
#define ADC_JSQR_JL_1CHANNELS (0x0 << ADC_JSQR_JL_LSB)
|
||||
#define ADC_JSQR_JL_2CHANNELS (0x1 << ADC_JSQR_JL_LSB)
|
||||
#define ADC_JSQR_JL_3CHANNELS (0x2 << ADC_JSQR_JL_LSB)
|
||||
#define ADC_JSQR_JL_4CHANNELS (0x3 << ADC_JSQR_JL_LSB)
|
||||
/**@}*/
|
||||
#define ADC_JSQR_JL_SHIFT 20
|
||||
#define ADC_JSQR_JL_MSK (0x2 << ADC_JSQR_JL_LSB)
|
||||
#define ADC_JSQR_JSQ4_MSK (0x1f << ADC_JSQR_JSQ4_LSB)
|
||||
#define ADC_JSQR_JSQ3_MSK (0x1f << ADC_JSQR_JSQ3_LSB)
|
||||
#define ADC_JSQR_JSQ2_MSK (0x1f << ADC_JSQR_JSQ2_LSB)
|
||||
#define ADC_JSQR_JSQ1_MSK (0x1f << ADC_JSQR_JSQ1_LSB)
|
||||
|
||||
#define ADC_JSQR_JSQ_VAL(n, val) ((val) << (((n) - 1) * 5))
|
||||
#define ADC_JSQR_JL_VAL(val) (((val) - 1) << ADC_JSQR_JL_SHIFT)
|
||||
|
||||
/* --- ADC_JDRx, ADC_DR values --------------------------------------------- */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user