jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

stm32: adc: fix f4/f7 temperature sensor channel defines.

Browse Source 
Lots of common stuff, but the F7 fixed the temperature sensor randomness
that the f4 had.  Separate the definitions properly.
This commit is contained in:
Karl Palsson 2019-05-10 22:18:08 +00:00
parent cc364d1ac2
commit 45e14a7bd3
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/libopencm3/stm32/common/adc_common_v1_multi.h
View File

@ -86,15 +86,6 @@ specific memorymap.h header before including this header file.*/
/* --- ADC Channels ------------------------------------------------------- */ /* --- ADC Channels ------------------------------------------------------- */
/** @defgroup adc_channel ADC Channel Numbers
* @ingroup adc_defines
* Thanks ST! F40x and F41x are on 16, F42x and F43x are on 18!
*@{*/
#define ADC_CHANNEL_TEMP_F40 16
#define ADC_CHANNEL_TEMP_F42 18
#define ADC_CHANNEL_VREF 17
#define ADC_CHANNEL_VBAT 18
/**@}*/
/* --- ADC_SR values ------------------------------------------------------- */ /* --- ADC_SR values ------------------------------------------------------- */

10
include/libopencm3/stm32/f4/adc.h
View File

@ -41,6 +41,16 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/stm32/common/adc_common_v1_multi.h> #include <libopencm3/stm32/common/adc_common_v1_multi.h>
/** @defgroup adc_channel ADC Channel Numbers
* @ingroup adc_defines
* Thanks ST! F40x and F41x are on 16, F42x and F43x are on 18!
*@{*/
#define ADC_CHANNEL_TEMP_F40 16
#define ADC_CHANNEL_TEMP_F42 18
#define ADC_CHANNEL_VREF 17
#define ADC_CHANNEL_VBAT 18
/**@}*/
/* --- Convenience macros -------------------------------------------------- */ /* --- Convenience macros -------------------------------------------------- */
/* EXTSEL[3:0]: External event selection for regular group. */ /* EXTSEL[3:0]: External event selection for regular group. */
/****************************************************************************/ /****************************************************************************/

8
include/libopencm3/stm32/f7/adc.h
View File

@ -41,6 +41,14 @@ LGPL License Terms @ref lgpl_license
#include <libopencm3/stm32/common/adc_common_v1_multi.h> #include <libopencm3/stm32/common/adc_common_v1_multi.h>
/** @defgroup adc_channel ADC Channel Numbers
* @ingroup adc_defines
*@{*/
#define ADC_CHANNEL_TEMP 18
#define ADC_CHANNEL_VREF 17
#define ADC_CHANNEL_VBAT 18
/**@}*/
/* --- Convenience macros -------------------------------------------------- */ /* --- Convenience macros -------------------------------------------------- */
/* EXTSEL[3:0]: External event selection for regular group. */ /* EXTSEL[3:0]: External event selection for regular group. */
/****************************************************************************/ /****************************************************************************/