1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 22:05:17 +03:00

Merge pull request #4485 from mikeller/cleanup_undefs

Cleaned up 'undef' after move to 'USE_<x>'.
This commit is contained in:
Michael Keller 2017-11-05 12:07:00 +13:00 committed by GitHub
commit 9322f3f5d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 12 deletions

View file

@ -101,13 +101,13 @@
//#define SONAR_ECHO_PIN PB0 //#define SONAR_ECHO_PIN PB0
//#define SONAR_TRIGGER_PIN PB5 //#define SONAR_TRIGGER_PIN PB5
#undef MAG #undef USE_MAG
#ifdef CC3D_OPBL #ifdef CC3D_OPBL
#define SKIP_CLI_COMMAND_HELP #define SKIP_CLI_COMMAND_HELP
//#undef USE_SERVOS //#undef USE_SERVOS
#undef BARO #undef USE_BARO
#undef SONAR #undef USE_SONAR
#undef USE_SERIAL_4WAY_BLHELI_INTERFACE #undef USE_SERIAL_4WAY_BLHELI_INTERFACE
//#undef USE_SERIALRX_SPEKTRUM // SRXL, DSM2 and DSMX protocol //#undef USE_SERIALRX_SPEKTRUM // SRXL, DSM2 and DSMX protocol
//#undef USE_SERIALRX_SBUS // Frsky and Futaba receivers //#undef USE_SERIALRX_SBUS // Frsky and Futaba receivers

View file

@ -120,10 +120,6 @@
#define USE_QUAD_MIXER_ONLY #define USE_QUAD_MIXER_ONLY
#undef USE_SERVOS #undef USE_SERVOS
#if (FLASH_SIZE <= 64)
#undef BLACKBOX
#endif
// Number of available PWM outputs // Number of available PWM outputs
//#define MAX_PWM_OUTPUT_PORTS 4 //#define MAX_PWM_OUTPUT_PORTS 4

View file

@ -95,9 +95,9 @@
#define VBAT_SCALE_DEFAULT 40 #define VBAT_SCALE_DEFAULT 40
#undef GPS #undef USE_GPS
#undef MAG #undef USE_MAG
#undef SONAR #undef USE_SONAR
#undef USE_SERVOS #undef USE_SERVOS
#undef BEEPER #undef BEEPER

View file

@ -20,8 +20,6 @@
#include <limits.h> #include <limits.h>
#include <cmath> #include <cmath>
#undef BARO
extern "C" { extern "C" {
#include "build/debug.h" #include "build/debug.h"