diff --git a/ChangeLog b/ChangeLog index d4892ad..646d884 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-07-04 NIIBE Yutaka + + * ChibiOS_2.0.8/os/hal/platforms/STM32/adc_lld.h: Apply a patch of + ADC from the branch of ChibiOS_2.0.X. + 2011-06-15 NIIBE Yutaka * Version 0.13. diff --git a/ChibiOS_2.0.8/os/hal/platforms/STM32/adc_lld.h b/ChibiOS_2.0.8/os/hal/platforms/STM32/adc_lld.h index cf2d4d4..05be6be 100644 --- a/ChibiOS_2.0.8/os/hal/platforms/STM32/adc_lld.h +++ b/ChibiOS_2.0.8/os/hal/platforms/STM32/adc_lld.h @@ -238,26 +238,51 @@ typedef struct { /* Driver macros. */ /*===========================================================================*/ +/** + * @brief Number of channels in a conversion sequence. + */ #define ADC_SQR1_NUM_CH(n) (((n) - 1) << 20) -#define ADC_SQR3_SQ0_N(n) ((n) << 0) -#define ADC_SQR3_SQ1_N(n) ((n) << 5) -#define ADC_SQR3_SQ2_N(n) ((n) << 10) -#define ADC_SQR3_SQ3_N(n) ((n) << 15) -#define ADC_SQR3_SQ4_N(n) ((n) << 20) -#define ADC_SQR3_SQ5_N(n) ((n) << 25) +#define ADC_SQR3_SQ1_N(n) ((n) << 0) /**< @brief 1st channel in seq. */ +#define ADC_SQR3_SQ2_N(n) ((n) << 5) /**< @brief 2nd channel in seq. */ +#define ADC_SQR3_SQ3_N(n) ((n) << 10) /**< @brief 3rd channel in seq. */ +#define ADC_SQR3_SQ4_N(n) ((n) << 15) /**< @brief 4th channel in seq. */ +#define ADC_SQR3_SQ5_N(n) ((n) << 20) /**< @brief 5th channel in seq. */ +#define ADC_SQR3_SQ6_N(n) ((n) << 25) /**< @brief 6th channel in seq. */ -#define ADC_SQR2_SQ6_N(n) ((n) << 0) -#define ADC_SQR2_SQ7_N(n) ((n) << 5) -#define ADC_SQR2_SQ8_N(n) ((n) << 10) -#define ADC_SQR2_SQ9_N(n) ((n) << 15) -#define ADC_SQR2_SQ10_N(n) ((n) << 20) -#define ADC_SQR2_SQ11_N(n) ((n) << 25) +#define ADC_SQR2_SQ7_N(n) ((n) << 0) /**< @brief 7th channel in seq. */ +#define ADC_SQR2_SQ8_N(n) ((n) << 5) /**< @brief 8th channel in seq. */ +#define ADC_SQR2_SQ9_N(n) ((n) << 10) /**< @brief 9th channel in seq. */ +#define ADC_SQR2_SQ10_N(n) ((n) << 15) /**< @brief 10th channel in seq.*/ +#define ADC_SQR2_SQ11_N(n) ((n) << 20) /**< @brief 11th channel in seq.*/ +#define ADC_SQR2_SQ12_N(n) ((n) << 25) /**< @brief 12th channel in seq.*/ -#define ADC_SQR1_SQ13_N(n) ((n) << 0) -#define ADC_SQR1_SQ14_N(n) ((n) << 5) -#define ADC_SQR1_SQ15_N(n) ((n) << 10) -#define ADC_SQR1_SQ16_N(n) ((n) << 15) +#define ADC_SQR1_SQ13_N(n) ((n) << 0) /**< @brief 13th channel in seq.*/ +#define ADC_SQR1_SQ14_N(n) ((n) << 5) /**< @brief 14th channel in seq.*/ +#define ADC_SQR1_SQ15_N(n) ((n) << 10) /**< @brief 15th channel in seq.*/ +#define ADC_SQR1_SQ16_N(n) ((n) << 15) /**< @brief 16th channel in seq.*/ + +#define ADC_SMPR2_SMP_AN0(n) ((n) << 0) /**< @brief AN0 sampling time. */ +#define ADC_SMPR2_SMP_AN1(n) ((n) << 3) /**< @brief AN1 sampling time. */ +#define ADC_SMPR2_SMP_AN2(n) ((n) << 6) /**< @brief AN2 sampling time. */ +#define ADC_SMPR2_SMP_AN3(n) ((n) << 9) /**< @brief AN3 sampling time. */ +#define ADC_SMPR2_SMP_AN4(n) ((n) << 12) /**< @brief AN4 sampling time. */ +#define ADC_SMPR2_SMP_AN5(n) ((n) << 15) /**< @brief AN5 sampling time. */ +#define ADC_SMPR2_SMP_AN6(n) ((n) << 18) /**< @brief AN6 sampling time. */ +#define ADC_SMPR2_SMP_AN7(n) ((n) << 21) /**< @brief AN7 sampling time. */ +#define ADC_SMPR2_SMP_AN8(n) ((n) << 24) /**< @brief AN8 sampling time. */ +#define ADC_SMPR2_SMP_AN9(n) ((n) << 27) /**< @brief AN9 sampling time. */ + +#define ADC_SMPR1_SMP_AN10(n) ((n) << 0) /**< @brief AN10 sampling time. */ +#define ADC_SMPR1_SMP_AN11(n) ((n) << 3) /**< @brief AN11 sampling time. */ +#define ADC_SMPR1_SMP_AN12(n) ((n) << 6) /**< @brief AN12 sampling time. */ +#define ADC_SMPR1_SMP_AN13(n) ((n) << 9) /**< @brief AN13 sampling time. */ +#define ADC_SMPR1_SMP_AN14(n) ((n) << 12) /**< @brief AN14 sampling time. */ +#define ADC_SMPR1_SMP_AN15(n) ((n) << 15) /**< @brief AN15 sampling time. */ +#define ADC_SMPR1_SMP_SENSOR(n) ((n) << 18) /**< @brief Temperature Sensor + sampling time. */ +#define ADC_SMPR1_SMP_VREF(n) ((n) << 21) /**< @brief Voltage Reference + sampling time. */ /*===========================================================================*/ /* External declarations. */