summaryrefslogtreecommitdiff
path: root/stm/adc.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-01-19 17:40:35 +0000
committerDamien George <damien.p.george@gmail.com>2014-01-19 17:40:35 +0000
commitb2ebb161d494864cdbee05ee8b74a775845e238e (patch)
tree26b91e9c0570fc1ff94ee89221e62fec828458e5 /stm/adc.c
parent127775381282c854031302173eedbd5046eb1601 (diff)
stm: Upgrade ST peripheral library from 1.1.0 to 1.3.0.
Diffstat (limited to 'stm/adc.c')
-rw-r--r--stm/adc.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/stm/adc.c b/stm/adc.c
index 2a50abee2..ecbcd6bc0 100644
--- a/stm/adc.c
+++ b/stm/adc.c
@@ -1,7 +1,5 @@
#include <stdio.h>
-#include <stm32f4xx_rcc.h>
-#include <stm32f4xx_gpio.h>
-#include <stm32f4xx_adc.h>
+#include <stm32f4xx.h>
#include "misc.h"
#include "mpconfig.h"
@@ -14,7 +12,7 @@
#define ADC_NUM_CHANNELS (16)
/* Internally connected ADC channels Temp/VBAT/VREF*/
-#if defined (STM32F40XX) || defined(STM32F41XX)
+#if defined (STM32F40XX) || defined(STM32F41XX) || defined(STM32F40_41xxx)
#define ADC_TEMP_CHANNEL (16)
#define ADC_VBAT_CHANNEL (18)
#define ADC_VREF_CHANNEL (17)
@@ -29,7 +27,7 @@
#define CORE_TEMP_AVG_SLOPE (3) /* (2.5mv/3.3v)*(2^ADC resoultion) */
/* VBAT divider */
-#if defined (STM32F40XX) || defined(STM32F41XX)
+#if defined (STM32F40XX) || defined(STM32F41XX) || defined(STM32F40_41xxx)
#define VBAT_DIV (2)
#elif defined (STM32F42XX) || defined(STM32F43XX)
#define VBAT_DIV (4)