Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 17:55:30 +03:00
Code Issues Wiki Activity

tidy up after merge

Browse source
This commit is contained in:
ctzsnooze 2024-10-17 11:49:32 +11:00
parent ce72f16a62
commit 7c85c9a7e7
7 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/blackbox/blackbox.c
View file

@ -63,7 +63,6 @@
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "flight/alt_hold.h" #include "flight/alt_hold.h"
#include "flight/pos_hold.h"
#include "flight/autopilot.h" #include "flight/autopilot.h"
#include "flight/failsafe.h" #include "flight/failsafe.h"
#include "flight/gps_rescue.h" #include "flight/gps_rescue.h"

1
src/main/cli/cli.c
View file

@ -104,7 +104,6 @@ bool cliMode = false;
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "flight/autopilot.h"
#include "flight/failsafe.h" #include "flight/failsafe.h"
#include "flight/imu.h" #include "flight/imu.h"
#include "flight/mixer.h" #include "flight/mixer.h"

3
src/main/fc/tasks.c
View file

@ -53,13 +53,12 @@
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "flight/alt_hold.h"
#include "flight/gps_rescue.h" #include "flight/gps_rescue.h"
#include "flight/imu.h" #include "flight/imu.h"
#include "flight/mixer.h" #include "flight/mixer.h"
#include "flight/pid.h" #include "flight/pid.h"
#include "flight/position.h" #include "flight/position.h"
#include "flight/autopilot.h"
#include "flight/alt_hold.h"
#include "flight/pos_hold.h" #include "flight/pos_hold.h"
#include "io/asyncfatfs/asyncfatfs.h" #include "io/asyncfatfs/asyncfatfs.h"

5
src/main/flight/autopilot.c
View file

@ -45,11 +45,11 @@
#define POSITION_J_SCALE 0.0008f #define POSITION_J_SCALE 0.0008f
static pidCoefficient_t altitudePidCoeffs; static pidCoefficient_t altitudePidCoeffs;
static pidCoefficient_t positionPidCoeffs;
static float altitudeI = 0.0f; static float altitudeI = 0.0f;
static float throttleOut = 0.0f; static float throttleOut = 0.0f;
static pidCoefficient_t positionPidCoeffs;
typedef struct { typedef struct {
uint32_t distanceCm; uint32_t distanceCm;
uint32_t previousDistanceCm; uint32_t previousDistanceCm;
@ -78,7 +78,6 @@ static posHoldState posHold = {
static gpsLocation_t currentTargetLocation = {0, 0, 0}; static gpsLocation_t currentTargetLocation = {0, 0, 0};
float posHoldAngle[ANGLE_INDEX_COUNT]; float posHoldAngle[ANGLE_INDEX_COUNT];
static pt1Filter_t velocityPitchLpf; static pt1Filter_t velocityPitchLpf;
static pt1Filter_t accelerationPitchLpf; static pt1Filter_t accelerationPitchLpf;
static pt1Filter_t velocityRollLpf; static pt1Filter_t velocityRollLpf;

1
src/main/flight/autopilot.h
View file

@ -31,5 +31,4 @@ void altitudeControl(float targetAltitudeCm, float taskIntervalS, float vertical
bool positionControl(float deadband); bool positionControl(float deadband);
bool isBelowLandingAltitude(void); bool isBelowLandingAltitude(void);
const pidCoefficient_t *getAltitudePidCoeffs(void);
float getAutopilotThrottle(void); float getAutopilotThrottle(void);

1
src/main/flight/pid.c
View file

@ -46,7 +46,6 @@
#include "fc/rc_controls.h" #include "fc/rc_controls.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "flight/alt_hold.h"
#include "flight/autopilot.h" #include "flight/autopilot.h"
#include "flight/gps_rescue.h" #include "flight/gps_rescue.h"
#include "flight/imu.h" #include "flight/imu.h"

2
src/main/flight/pos_hold.c
View file

@ -21,8 +21,8 @@
#include "math.h" #include "math.h"
#include "build/debug.h" #include "build/debug.h"
#include "common/maths.h" #include "common/maths.h"
#include "config/config.h" #include "config/config.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "fc/rc.h" #include "fc/rc.h"