From ad3212a47ba23af1695d98ebf0d44fe1bfcf7e00 Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Wed, 18 May 2016 17:41:41 +0100 Subject: [PATCH] Added common target header file. --- src/main/target/ALIENWIIF3/target.h | 2 -- src/main/target/CC3D/target.h | 5 ----- src/main/target/CJMCU/target.h | 4 +--- src/main/target/EUSTM32F103RC/target.h | 3 --- src/main/target/MOTOLAB/target.h | 3 --- src/main/target/NAZE/target.h | 4 ---- src/main/target/OLIMEXINO/target.h | 1 - src/main/target/PORT103R/target.h | 4 ---- src/main/target/RMDO/target.h | 3 --- src/main/target/SPARKY/target.h | 3 --- src/main/target/SPRACINGF3/target.h | 3 --- src/main/target/common.h | 27 +++++++++++++++++++++++++++ 12 files changed, 28 insertions(+), 34 deletions(-) create mode 100644 src/main/target/common.h diff --git a/src/main/target/ALIENWIIF3/target.h b/src/main/target/ALIENWIIF3/target.h index 1d06dad40..9e7c28923 100644 --- a/src/main/target/ALIENWIIF3/target.h +++ b/src/main/target/ALIENWIIF3/target.h @@ -118,8 +118,6 @@ //#define GPS_PROTO_I2C_NAV //#define GPS_PROTO_NAZA -//#define DISPLAY -//#define DISPLAY_ARMED_BITMAP #define USE_SERVOS #define USE_CLI diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h index 9ede87703..a782103b2 100644 --- a/src/main/target/CC3D/target.h +++ b/src/main/target/CC3D/target.h @@ -70,8 +70,6 @@ #define INVERTER #define BEEPER -//#define DISPLAY -//#define DISPLAY_ARMED_BITMAP #define USE_VCP #define USE_USART1 @@ -146,8 +144,6 @@ #define USE_SERVOS #define USE_CLI -#define SKIP_CLI_COMMAND_HELP - //#define USE_SERIAL_4WAY_BLHELI_INTERFACE #define SPEKTRUM_BIND @@ -156,7 +152,6 @@ #define BIND_PIN Pin_11 //Disables uncommon predefined mixer settings like BiCopter, H6 and similar exotics -#define DISABLE_UNCOMMON_MIXERS #ifdef CC3D_OPBL #define USE_QUAD_MIXER_ONLY diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h index a14a3a35a..f80c48f6e 100644 --- a/src/main/target/CJMCU/target.h +++ b/src/main/target/CJMCU/target.h @@ -58,7 +58,7 @@ // #define SOFT_I2C_PB67 #define SERIAL_RX -//#define USE_SERVOS +#define USE_SERVOS #define USE_CLI #define SPEKTRUM_BIND @@ -74,10 +74,8 @@ #define BLACKBOX #else #define SKIP_TASK_STATISTICS -#define SKIP_CLI_COMMAND_HELP #endif //#undef USE_CLI //#define BLACKBOX -#define DISABLE_UNCOMMON_MIXERS diff --git a/src/main/target/EUSTM32F103RC/target.h b/src/main/target/EUSTM32F103RC/target.h index 071e58bdb..f95cedb5a 100644 --- a/src/main/target/EUSTM32F103RC/target.h +++ b/src/main/target/EUSTM32F103RC/target.h @@ -91,8 +91,6 @@ #define LED0 #define LED1 -#define DISPLAY -//#define DISPLAY_ARMED_BITMAP #define INVERTER #define USE_USART1 @@ -158,4 +156,3 @@ #define BIND_PORT GPIOA #define BIND_PIN Pin_3 -#define DISABLE_UNCOMMON_MIXERS diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h index 49d4e967b..a7f70ca45 100644 --- a/src/main/target/MOTOLAB/target.h +++ b/src/main/target/MOTOLAB/target.h @@ -123,9 +123,6 @@ // #define GPS_PROTO_I2C_NAV //#define GPS_PROTO_NAZA -#define DISPLAY -#define DISPLAY_ARMED_BITMAP - #define USE_SERVOS #define USE_FLASHFS #define USE_FLASH_M25P16 diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h index 98e51ef53..512e7139e 100644 --- a/src/main/target/NAZE/target.h +++ b/src/main/target/NAZE/target.h @@ -139,8 +139,6 @@ #define LED0 #define LED1 #define INVERTER -#define DISPLAY -//#define DISPLAY_ARMED_BITMAP #define USE_USART1 #define USE_USART2 @@ -212,7 +210,6 @@ #define USE_SERVOS #define USE_CLI -#define SKIP_CLI_COMMAND_HELP #define SPEKTRUM_BIND // USART2, PA3 @@ -233,4 +230,3 @@ #define BINDPLUG_PIN Pin_5 #endif -#define DISABLE_UNCOMMON_MIXERS diff --git a/src/main/target/OLIMEXINO/target.h b/src/main/target/OLIMEXINO/target.h index c2482ba33..bfa508e96 100644 --- a/src/main/target/OLIMEXINO/target.h +++ b/src/main/target/OLIMEXINO/target.h @@ -130,4 +130,3 @@ #define USE_SERVOS #define USE_CLI -#define DISABLE_UNCOMMON_MIXERS diff --git a/src/main/target/PORT103R/target.h b/src/main/target/PORT103R/target.h index 0d1caa74a..d19e5e1ac 100644 --- a/src/main/target/PORT103R/target.h +++ b/src/main/target/PORT103R/target.h @@ -118,8 +118,6 @@ #define LED1 #define LED2 #define INVERTER -#define DISPLAY -//#define DISPLAY_ARMED_BITMAP #define USE_USART1 #define USE_USART2 @@ -182,6 +180,4 @@ #define USE_SERVOS #define USE_CLI -#define DISABLE_UNCOMMON_MIXERS - #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/RMDO/target.h b/src/main/target/RMDO/target.h index 04a2de82b..aa523bfba 100644 --- a/src/main/target/RMDO/target.h +++ b/src/main/target/RMDO/target.h @@ -183,9 +183,6 @@ #define SERIAL_RX -#define DISPLAY -//#define DISPLAY_ARMED_BITMAP - #define USE_SERVOS #define USE_CLI diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h index 6213f16cc..304fcf368 100644 --- a/src/main/target/SPARKY/target.h +++ b/src/main/target/SPARKY/target.h @@ -121,9 +121,6 @@ #define GPS_PROTO_I2C_NAV #define GPS_PROTO_NAZA -#define DISPLAY -#define DISPLAY_ARMED_BITMAP - #define SERIAL_RX #define TELEMETRY #define TELEMETRY_FRSKY diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h index f2309c5b0..e31b30a61 100644 --- a/src/main/target/SPRACINGF3/target.h +++ b/src/main/target/SPRACINGF3/target.h @@ -171,9 +171,6 @@ #define BLACKBOX #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT -#define DISPLAY -#define DISPLAY_ARMED_BITMAP - #define GPS #define GPS_PROTO_NMEA #define GPS_PROTO_UBLOX diff --git a/src/main/target/common.h b/src/main/target/common.h new file mode 100644 index 000000000..9ceab9894 --- /dev/null +++ b/src/main/target/common.h @@ -0,0 +1,27 @@ +/* + * This file is part of Cleanflight. + * + * Cleanflight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Cleanflight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Cleanflight. If not, see . + */ + + +#pragma once + +#if (FLASH_SIZE > 128) +#define DISPLAY +#define DISPLAY_ARMED_BITMAP +#else +#define SKIP_CLI_COMMAND_HELP +#define DISABLE_UNCOMMON_MIXERS +#endif -- 2.11.4.GIT