From 80d4a0339a278bbd9a7eec822d9c7e0d8843c6b0 Mon Sep 17 00:00:00 2001
From: blckmn <blackman@xtra.com.au>
Date: Sat, 1 Jun 2019 11:27:15 +1000
Subject: [PATCH] Removing VIVAF4AIO target

---
 src/main/target/DALRCF405/VIVAF4AIO.mk |  1 -
 src/main/target/DALRCF405/target.h     | 21 ++++-----------------
 2 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/target/DALRCF405/VIVAF4AIO.mk

diff --git a/src/main/target/DALRCF405/VIVAF4AIO.mk b/src/main/target/DALRCF405/VIVAF4AIO.mk
deleted file mode 100644
index 6e0046b11..000000000
--- a/src/main/target/DALRCF405/VIVAF4AIO.mk
+++ /dev/null
@@ -1 +0,0 @@
-# VIVAF4AIO has motors 7 and 8 defined.
diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h
index 08fcf443f..2786010a3 100644
--- a/src/main/target/DALRCF405/target.h
+++ b/src/main/target/DALRCF405/target.h
@@ -20,13 +20,8 @@
 
 #pragma once
 
-#if defined(VIVAF4AIO)
-# define TARGET_BOARD_IDENTIFIER "VIVA"
-# define USBD_PRODUCT_STRING     "VIVAF405AIO"
-#else
-# define TARGET_BOARD_IDENTIFIER "DLF4"
-# define USBD_PRODUCT_STRING  "DALRCF405"
-#endif
+#define TARGET_BOARD_IDENTIFIER "DLF4"
+#define USBD_PRODUCT_STRING     "DALRCF405"
 //----------------------------------------
 
 //LED & BEE------------------------------- 
@@ -60,11 +55,7 @@
 #define USE_GYRO_SPI_MPU6000
 #define USE_ACC_SPI_MPU6000
 
-#if defined(VIVAF4AIO)
-# define GYRO_1_ALIGN            CW0_DEG
-#else
-# define GYRO_1_ALIGN            CW90_DEG
-#endif
+#define GYRO_1_ALIGN            CW90_DEG
 
 //Baro & MAG------------------------------- 
 #define USE_I2C
@@ -158,9 +149,5 @@
 #define TARGET_IO_PORTC         0xffff
 #define TARGET_IO_PORTD         (BIT(2))
 
-#if defined(VIVAF4AIO)
-# define USABLE_TIMER_CHANNEL_COUNT 9
-#else
-# define USABLE_TIMER_CHANNEL_COUNT 11
-#endif
+#define USABLE_TIMER_CHANNEL_COUNT 11
 #define USED_TIMERS             (TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(8)|TIM_N(12))
-- 
2.11.4.GIT