From d6d70d5a7493a46df763e799f794b78836641c05 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Fri, 1 Dec 2017 06:50:34 +0000
Subject: [PATCH] Fixed F1 build

---
 make/mcu/STM32F1.mk              |  2 +-
 src/main/drivers/adc.c           |  7 +++++++
 src/main/drivers/adc_stm32f10x.c | 12 ------------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/make/mcu/STM32F1.mk b/make/mcu/STM32F1.mk
index f8d0f09d1e..fd30a52114 100644
--- a/make/mcu/STM32F1.mk
+++ b/make/mcu/STM32F1.mk
@@ -61,7 +61,7 @@ VCP_SRC = \
 MCU_COMMON_SRC = \
             drivers/adc_stm32f10x.c \
             drivers/bus_i2c_stm32f10x.c \
-            drivers/bus_std_periph.c \
+            drivers/bus_spi_stdperiph.c \
             drivers/dma.c \
             drivers/inverter.c \
             drivers/light_ws2811strip_stdperiph.c \
diff --git a/src/main/drivers/adc.c b/src/main/drivers/adc.c
index b709c6c41d..f387d39eca 100644
--- a/src/main/drivers/adc.c
+++ b/src/main/drivers/adc.c
@@ -96,9 +96,16 @@ bool adcVerifyPin(ioTag_t tag, ADCDevice device)
     }
 
     for (int map = 0 ; map < ADC_TAG_MAP_COUNT ; map++) {
+#if defined(STM32F1)
+        UNUSED(device);
+        if ((adcTagMap[map].tag == tag)) {
+            return true;
+        }
+#else
         if ((adcTagMap[map].tag == tag) && (adcTagMap[map].devices & (1 << device))) {
             return true;
         }
+#endif
     }
 
     return false;
diff --git a/src/main/drivers/adc_stm32f10x.c b/src/main/drivers/adc_stm32f10x.c
index abf5b255c3..6159af7084 100644
--- a/src/main/drivers/adc_stm32f10x.c
+++ b/src/main/drivers/adc_stm32f10x.c
@@ -37,18 +37,6 @@ const adcDevice_t adcHardware[] = {
     { .ADCx = ADC1, .rccADC = RCC_APB2(ADC1), .DMAy_Channelx = DMA1_Channel1 }
 };
 
-ADCDevice adcDeviceByInstance(ADC_TypeDef *instance)
-{
-    if (instance == ADC1)
-        return ADCDEV_1;
-
-/* TODO -- ADC2 available on large 10x devices.
-    if (instance == ADC2)
-        return ADCDEV_2;
-*/
-    return ADCINVALID;
-}
-
 const adcTagMap_t adcTagMap[] = {
     { DEFIO_TAG_E__PA0, ADC_Channel_0 }, // ADC12
     { DEFIO_TAG_E__PA1, ADC_Channel_1 }, // ADC12