From a0d548db9afff119710cd85798bd8feb6ae4a26a Mon Sep 17 00:00:00 2001 From: Mark Charlebois Date: Thu, 7 May 2015 11:35:01 -0700 Subject: [PATCH] Changed circuit_breaker to not use px4.h The inclusion of px4.h requires C++ features not supported in the Hexagon toolchain. The features are not required so the required headers are used instead. Signed-off-by: Mark Charlebois --- src/modules/systemlib/circuit_breaker.cpp | 3 ++- src/modules/systemlib/module.mk | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/modules/systemlib/circuit_breaker.cpp b/src/modules/systemlib/circuit_breaker.cpp index f5ff0afd4b..ba9e9f6219 100644 --- a/src/modules/systemlib/circuit_breaker.cpp +++ b/src/modules/systemlib/circuit_breaker.cpp @@ -42,7 +42,8 @@ * parameter needs to set to the key (magic). */ -#include +#include +#include #include bool circuit_breaker_enabled(const char *breaker, int32_t magic) diff --git a/src/modules/systemlib/module.mk b/src/modules/systemlib/module.mk index e648c577d9..0e023cf1b1 100644 --- a/src/modules/systemlib/module.mk +++ b/src/modules/systemlib/module.mk @@ -49,17 +49,17 @@ SRCS = err.c \ otp.c \ board_serial.c \ pwm_limit/pwm_limit.c \ - mcu_version.c + mcu_version.c \ + bson/tinybson.c \ + circuit_breaker.cpp \ + circuit_breaker_params.c ifeq ($(PX4_TARGET_OS),nuttx) SRCS += up_cxxinitialize.c endif ifneq ($(PX4_TARGET_OS),qurt) -SRCS += hx_stream.c \ - circuit_breaker.cpp \ - circuit_breaker_params.c \ - bson/tinybson.c +SRCS += hx_stream.c endif MAXOPTIMIZATION = -Os