From 762f027e8afdf1e85dd6f2a5a6082d878af9a026 Mon Sep 17 00:00:00 2001
From: Martin Budden <mjbudden@gmail.com>
Date: Tue, 14 Jun 2016 16:48:40 +0100
Subject: [PATCH] Moved BST (Black Sheep Telemetry) code into COLIBRI_RACE
 target directory.

---
 src/main/main.c                                              | 5 ++++-
 src/main/{drivers => target/COLIBRI_RACE}/bus_bst.h          | 0
 .../{drivers => target/COLIBRI_RACE}/bus_bst_stm32f30x.c     | 2 +-
 src/main/{io => target/COLIBRI_RACE}/i2c_bst.c               | 3 +++
 src/main/{io => target/COLIBRI_RACE}/i2c_bst.h               | 2 --
 src/main/target/COLIBRI_RACE/target.mk                       | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)
 rename src/main/{drivers => target/COLIBRI_RACE}/bus_bst.h (100%)
 rename src/main/{drivers => target/COLIBRI_RACE}/bus_bst_stm32f30x.c (99%)
 rename src/main/{io => target/COLIBRI_RACE}/i2c_bst.c (99%)
 rename src/main/{io => target/COLIBRI_RACE}/i2c_bst.h (96%)

diff --git a/src/main/main.c b/src/main/main.c
index 2a0822360..d836deee0 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -47,7 +47,6 @@
 #include "drivers/pwm_output.h"
 #include "drivers/adc.h"
 #include "drivers/bus_i2c.h"
-#include "drivers/bus_bst.h"
 #include "drivers/bus_spi.h"
 #include "drivers/inverter.h"
 #include "drivers/flash_m25p16.h"
@@ -59,6 +58,10 @@
 #include "drivers/io.h"
 #include "drivers/exti.h"
 
+#ifdef USE_BST
+#include "bus_bst.h"
+#endif
+
 #include "rx/rx.h"
 
 #include "io/beeper.h"
diff --git a/src/main/drivers/bus_bst.h b/src/main/target/COLIBRI_RACE/bus_bst.h
similarity index 100%
rename from src/main/drivers/bus_bst.h
rename to src/main/target/COLIBRI_RACE/bus_bst.h
diff --git a/src/main/drivers/bus_bst_stm32f30x.c b/src/main/target/COLIBRI_RACE/bus_bst_stm32f30x.c
similarity index 99%
rename from src/main/drivers/bus_bst_stm32f30x.c
rename to src/main/target/COLIBRI_RACE/bus_bst_stm32f30x.c
index 201985e9e..8ab8f6cf5 100644
--- a/src/main/drivers/bus_bst_stm32f30x.c
+++ b/src/main/target/COLIBRI_RACE/bus_bst_stm32f30x.c
@@ -12,7 +12,7 @@
 
 #include <build_config.h>
 
-#include "nvic.h"
+#include "drivers/nvic.h"
 #include "bus_bst.h"
 
 
diff --git a/src/main/io/i2c_bst.c b/src/main/target/COLIBRI_RACE/i2c_bst.c
similarity index 99%
rename from src/main/io/i2c_bst.c
rename to src/main/target/COLIBRI_RACE/i2c_bst.c
index f0891e8e0..c0462d6db 100644
--- a/src/main/io/i2c_bst.c
+++ b/src/main/target/COLIBRI_RACE/i2c_bst.c
@@ -11,6 +11,8 @@
 
 #include "platform.h"
 
+#include "i2c_bst.h"
+
 #include "common/axis.h"
 #include "common/color.h"
 #include "common/maths.h"
@@ -69,6 +71,7 @@
 #include "hardware_revision.h"
 #endif
 
+#include "bus_bst.h"
 #include "i2c_bst.h"
 
 void useRcControlsConfig(modeActivationCondition_t *modeActivationConditions, escAndServoConfig_t *escAndServoConfigToUse, pidProfile_t *pidProfileToUse);
diff --git a/src/main/io/i2c_bst.h b/src/main/target/COLIBRI_RACE/i2c_bst.h
similarity index 96%
rename from src/main/io/i2c_bst.h
rename to src/main/target/COLIBRI_RACE/i2c_bst.h
index d2678764e..cf9ee4611 100644
--- a/src/main/io/i2c_bst.h
+++ b/src/main/target/COLIBRI_RACE/i2c_bst.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "drivers/bus_bst.h"
-
 void bstProcessInCommand(void);
 void bstSlaveProcessInCommand(void);
 void taskBstMasterProcess(void);
diff --git a/src/main/target/COLIBRI_RACE/target.mk b/src/main/target/COLIBRI_RACE/target.mk
index 315800073..b59d32d0e 100644
--- a/src/main/target/COLIBRI_RACE/target.mk
+++ b/src/main/target/COLIBRI_RACE/target.mk
@@ -2,8 +2,8 @@ F3_TARGETS  += $(TARGET)
 FEATURES    = VCP 
 
 TARGET_SRC = \
-            io/i2c_bst.c \
-            drivers/bus_bst_stm32f30x.c \
+            i2c_bst.c \
+            bus_bst_stm32f30x.c \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6000.c \