Fixed CC3D related build flags.
This commit is contained in:
parent
825475fd43
commit
876fe536e6
3
Makefile
3
Makefile
|
@ -255,6 +255,9 @@ endif
|
||||||
|
|
||||||
ifeq ($(TARGET),$(filter $(TARGET), $(CC3D_TARGETS)))
|
ifeq ($(TARGET),$(filter $(TARGET), $(CC3D_TARGETS)))
|
||||||
TARGET_FLAGS := $(TARGET_FLAGS) -DCC3D
|
TARGET_FLAGS := $(TARGET_FLAGS) -DCC3D
|
||||||
|
ifeq ($(TARGET),CC3D_OPBL)
|
||||||
|
TARGET_FLAGS := $(TARGET_FLAGS) -DCC3D_OPBL
|
||||||
|
endif
|
||||||
TARGET_DIR = $(ROOT)/src/main/target/CC3D
|
TARGET_DIR = $(ROOT)/src/main/target/CC3D
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -70,11 +70,11 @@ typedef struct drv_pwm_config_s {
|
||||||
#ifdef USE_SERVOS
|
#ifdef USE_SERVOS
|
||||||
bool useServos;
|
bool useServos;
|
||||||
bool useChannelForwarding; // configure additional channels as servos
|
bool useChannelForwarding; // configure additional channels as servos
|
||||||
#ifdef CC3D
|
|
||||||
bool useBuzzerP6;
|
|
||||||
#endif
|
|
||||||
uint16_t servoPwmRate;
|
uint16_t servoPwmRate;
|
||||||
uint16_t servoCenterPulse;
|
uint16_t servoCenterPulse;
|
||||||
|
#endif
|
||||||
|
#ifdef CC3D
|
||||||
|
bool useBuzzerP6;
|
||||||
#endif
|
#endif
|
||||||
bool airplane; // fixed wing hardware config, lots of servos etc
|
bool airplane; // fixed wing hardware config, lots of servos etc
|
||||||
uint16_t motorPwmRate;
|
uint16_t motorPwmRate;
|
||||||
|
|
|
@ -128,11 +128,15 @@
|
||||||
#define SERIAL_RX
|
#define SERIAL_RX
|
||||||
#define USE_SERVOS
|
#define USE_SERVOS
|
||||||
#define USE_CLI
|
#define USE_CLI
|
||||||
//#define SONAR
|
#define SONAR
|
||||||
//#define GPS
|
//#define GPS
|
||||||
|
|
||||||
#undef BARO
|
#undef BARO
|
||||||
|
|
||||||
|
#ifdef CC3D_OPBL
|
||||||
#define SKIP_CLI_COMMAND_HELP
|
#define SKIP_CLI_COMMAND_HELP
|
||||||
#define SKIP_PID_LUXFLOAT
|
#define SKIP_PID_LUXFLOAT
|
||||||
|
#undef SONAR
|
||||||
|
#undef GPS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue