Merge pull request #876 from martinbudden/bf_header_rationalisation
Used forward references to remove #includes from header files
This commit is contained in:
commit
ea0f1f11f8
|
@ -72,6 +72,7 @@
|
|||
#include "flight/altitudehold.h"
|
||||
#include "flight/failsafe.h"
|
||||
#include "flight/imu.h"
|
||||
#include "flight/pid.h"
|
||||
#include "flight/navigation.h"
|
||||
|
||||
#include "config/runtime_config.h"
|
||||
|
|
|
@ -53,6 +53,7 @@
|
|||
#include "flight/altitudehold.h"
|
||||
#include "flight/failsafe.h"
|
||||
#include "flight/imu.h"
|
||||
#include "flight/pid.h"
|
||||
#include "flight/navigation.h"
|
||||
|
||||
#include "config/runtime_config.h"
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#include "debug.h"
|
||||
|
||||
#include "build_config.h"
|
||||
#include "debug.h"
|
||||
|
||||
#include "blackbox/blackbox_io.h"
|
||||
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
#define I2C_LONG_TIMEOUT ((uint32_t)(10 * I2C_SHORT_TIMEOUT))
|
||||
#define I2C_DEFAULT_TIMEOUT I2C_SHORT_TIMEOUT
|
||||
|
||||
#include "drivers/io.h"
|
||||
#include "drivers/rcc.h"
|
||||
#include "io.h"
|
||||
#include "rcc.h"
|
||||
|
||||
#ifndef I2C_DEVICE
|
||||
#define I2C_DEVICE I2CINVALID
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "drivers/io.h"
|
||||
#include "io.h"
|
||||
|
||||
// old EXTI interface, to be replaced
|
||||
typedef struct extiConfig_s {
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "drivers/io.h"
|
||||
#include "io.h"
|
||||
|
||||
#ifdef BEEPER
|
||||
#define BEEP_TOGGLE systemBeepToggle()
|
||||
|
|
|
@ -15,19 +15,21 @@
|
|||
* along with Cleanflight. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "io/escservo.h"
|
||||
#include "io/rc_controls.h"
|
||||
#include "flight/pid.h"
|
||||
|
||||
#include "sensors/barometer.h"
|
||||
#pragma once
|
||||
|
||||
extern int32_t AltHold;
|
||||
extern int32_t vario;
|
||||
|
||||
void calculateEstimatedAltitude(uint32_t currentTime);
|
||||
|
||||
void configureAltitudeHold(pidProfile_t *initialPidProfile, barometerConfig_t *intialBarometerConfig, rcControlsConfig_t *initialRcControlsConfig, escAndServoConfig_t *initialEscAndServoConfig);
|
||||
void applyAltHold(airplaneConfig_t *airplaneConfig);
|
||||
struct pidProfile_s;
|
||||
struct barometerConfig_s;
|
||||
struct rcControlsConfig_s;
|
||||
struct escAndServoConfig_s;
|
||||
void configureAltitudeHold(struct pidProfile_s *initialPidProfile, struct barometerConfig_s *intialBarometerConfig, struct rcControlsConfig_s *initialRcControlsConfig, struct escAndServoConfig_s *initialEscAndServoConfig);
|
||||
|
||||
struct airplaneConfig_t;
|
||||
void applyAltHold(struct airplaneConfig_s *airplaneConfig);
|
||||
void updateAltHoldState(void);
|
||||
void updateSonarAltHoldState(void);
|
||||
|
||||
|
|
|
@ -69,9 +69,10 @@ typedef struct accProcessor_s {
|
|||
accProcessorState_e state;
|
||||
} accProcessor_t;
|
||||
|
||||
struct pidProfile_s;
|
||||
void imuConfigure(
|
||||
imuRuntimeConfig_t *initialImuRuntimeConfig,
|
||||
pidProfile_t *initialPidProfile,
|
||||
struct pidProfile_s *initialPidProfile,
|
||||
accDeadband_t *initialAccDeadband,
|
||||
uint16_t throttle_correction_angle
|
||||
);
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
* You should have received a copy of the GNU General Public License
|
||||
* along with Cleanflight. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "rx/rx.h"
|
||||
|
||||
#pragma once
|
||||
|
||||
|
|
|
@ -63,6 +63,8 @@
|
|||
|
||||
#include "io/display.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
|
||||
#include "scheduler/scheduler.h"
|
||||
|
||||
extern profile_t *currentProfile;
|
||||
|
|
|
@ -17,8 +17,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "rx/rx.h"
|
||||
|
||||
typedef enum {
|
||||
BOXARM = 0,
|
||||
BOXANGLE,
|
||||
|
@ -167,8 +165,9 @@ typedef struct rcControlsConfig_s {
|
|||
bool areUsingSticksToArm(void);
|
||||
|
||||
bool areSticksInApModePosition(uint16_t ap_mode);
|
||||
throttleStatus_e calculateThrottleStatus(rxConfig_t *rxConfig, uint16_t deadband3d_throttle);
|
||||
void processRcStickPositions(rxConfig_t *rxConfig, throttleStatus_e throttleStatus, bool disarm_kill_switch);
|
||||
struct rxConfig_s;
|
||||
throttleStatus_e calculateThrottleStatus(struct rxConfig_s *rxConfig, uint16_t deadband3d_throttle);
|
||||
void processRcStickPositions(struct rxConfig_s *rxConfig, throttleStatus_e throttleStatus, bool disarm_kill_switch);
|
||||
|
||||
bool isRangeActive(uint8_t auxChannelIndex, channelRange_t *range);
|
||||
void updateActivatedModes(modeActivationCondition_t *modeActivationConditions);
|
||||
|
@ -257,7 +256,7 @@ bool isAirmodeActive(void);
|
|||
bool isSuperExpoActive(void);
|
||||
void resetAdjustmentStates(void);
|
||||
void updateAdjustmentStates(adjustmentRange_t *adjustmentRanges);
|
||||
void processRcAdjustments(controlRateConfig_t *controlRateConfig, rxConfig_t *rxConfig);
|
||||
void processRcAdjustments(controlRateConfig_t *controlRateConfig, struct rxConfig_s *rxConfig);
|
||||
|
||||
bool isUsingSticksForArming(void);
|
||||
|
||||
|
|
|
@ -18,12 +18,13 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "io/rc_controls.h"
|
||||
#include "io/escservo.h"
|
||||
#include "config/config.h"
|
||||
|
||||
#include "io/escservo.h"
|
||||
#include "io/rc_controls.h"
|
||||
#include "io/rc_curves.h"
|
||||
|
||||
#include "config/config.h"
|
||||
#include "rx/rx.h"
|
||||
|
||||
#define THROTTLE_LOOKUP_LENGTH 12
|
||||
static int16_t lookupThrottleRC[THROTTLE_LOOKUP_LENGTH]; // lookup table for expo & mid THROTTLE
|
||||
|
|
|
@ -41,6 +41,8 @@
|
|||
#include "drivers/timer.h"
|
||||
#include "drivers/pwm_rx.h"
|
||||
#include "drivers/system.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
#include "rx/pwm.h"
|
||||
#include "rx/sbus.h"
|
||||
#include "rx/spektrum.h"
|
||||
|
@ -51,8 +53,6 @@
|
|||
#include "rx/ibus.h"
|
||||
#include "rx/jetiexbus.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
|
||||
|
||||
//#define DEBUG_RX_SIGNAL_LOSS
|
||||
|
||||
|
|
|
@ -17,7 +17,5 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "rx/rx.h"
|
||||
|
||||
bool xBusInit(rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig, rcReadRawDataPtr *callback);
|
||||
uint8_t xBusFrameStatus(void);
|
||||
|
|
|
@ -35,6 +35,8 @@
|
|||
#include "io/rc_controls.h"
|
||||
#include "io/beeper.h"
|
||||
|
||||
#include "rx/rx.h"
|
||||
|
||||
#define VBATT_PRESENT_THRESHOLD_MV 10
|
||||
#define VBATT_LPF_FREQ 0.4f
|
||||
|
||||
|
|
|
@ -17,14 +17,13 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "rx/rx.h"
|
||||
|
||||
typedef enum {
|
||||
FRSKY_VFAS_PRECISION_LOW = 0,
|
||||
FRSKY_VFAS_PRECISION_HIGH
|
||||
} frskyVFasPrecision_e;
|
||||
|
||||
void handleFrSkyTelemetry(rxConfig_t *rxConfig, uint16_t deadband3d_throttle);
|
||||
struct rxConfig_s;
|
||||
void handleFrSkyTelemetry(struct rxConfig_s *rxConfig, uint16_t deadband3d_throttle);
|
||||
void checkFrSkyTelemetryState(void);
|
||||
|
||||
void initFrSkyTelemetry(telemetryConfig_t *telemetryConfig);
|
||||
|
|
|
@ -488,7 +488,8 @@ typedef struct HOTT_AIRESC_MSG_s {
|
|||
void handleHoTTTelemetry(void);
|
||||
void checkHoTTTelemetryState(void);
|
||||
|
||||
void initHoTTTelemetry(telemetryConfig_t *telemetryConfig);
|
||||
struct telemetryConfig_s;
|
||||
void initHoTTTelemetry(struct telemetryConfig_s *telemetryConfig);
|
||||
void configureHoTTTelemetryPort(void);
|
||||
void freeHoTTTelemetryPort(void);
|
||||
|
||||
|
|
|
@ -19,7 +19,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
void initLtmTelemetry(telemetryConfig_t *initialTelemetryConfig);
|
||||
struct telemetryConfig_s;
|
||||
void initLtmTelemetry(struct telemetryConfig_s *initialTelemetryConfig);
|
||||
void handleLtmTelemetry(void);
|
||||
void checkLtmTelemetryState(void);
|
||||
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
void initSmartPortTelemetry(telemetryConfig_t *);
|
||||
struct telemetryConfig_s;
|
||||
void initSmartPortTelemetry(struct telemetryConfig_s *);
|
||||
|
||||
void handleSmartPortTelemetry(void);
|
||||
void checkSmartPortTelemetryState(void);
|
||||
|
|
Loading…
Reference in New Issue