Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 23:35:34 +03:00
Code Issues Wiki Activity

Re-organise included files and functions thanks Karate

Browse source
This commit is contained in:
ctzsnooze 2024-10-08 07:59:01 +11:00
parent 36f7379d6f
commit a853b6ced3
12 changed files with 7 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mk/source.mk
View file

@ -23,7 +23,6 @@ PG_SRC = \
pg/msp.c \ pg/msp.c \
pg/pg.c \ pg/pg.c \
pg/piniobox.c \ pg/piniobox.c \
pg/autopilot.c \
pg/pinio.c \ pg/pinio.c \
pg/pin_pull_up_down.c \ pg/pin_pull_up_down.c \
pg/pos_hold.c \ pg/pos_hold.c \
@ -163,8 +162,8 @@ COMMON_SRC = \
fc/rc_controls.c \ fc/rc_controls.c \
fc/rc_modes.c \ fc/rc_modes.c \
flight/alt_hold.c \ flight/alt_hold.c \
flight/pos_hold.c \
flight/autopilot.c \ flight/autopilot.c \
flight/pos_hold.c \
flight/dyn_notch_filter.c \ flight/dyn_notch_filter.c \
flight/failsafe.c \ flight/failsafe.c \
flight/gps_rescue.c \ flight/gps_rescue.c \

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

@ -70,7 +70,6 @@
#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/rpm_filter.h" #include "flight/rpm_filter.h"
#include "flight/servos.h" #include "flight/servos.h"
#include "flight/imu.h" #include "flight/imu.h"

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

@ -110,7 +110,6 @@ bool cliMode = false;
#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/servos.h" #include "flight/servos.h"
#include "io/asyncfatfs/asyncfatfs.h" #include "io/asyncfatfs/asyncfatfs.h"

3
src/main/cli/settings.c
View file

@ -64,9 +64,6 @@
#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/rpm_filter.h" #include "flight/rpm_filter.h"
#include "flight/servos.h" #include "flight/servos.h"

9
src/main/cms/cms_menu_gps_rescue.c
View file

@ -40,7 +40,6 @@
#include "flight/autopilot.h" #include "flight/autopilot.h"
#include "flight/gps_rescue.h" #include "flight/gps_rescue.h"
#include "flight/position.h" #include "flight/position.h"
#include "flight/autopilot.h"
static uint16_t gpsRescueConfig_minStartDistM; //meters static uint16_t gpsRescueConfig_minStartDistM; //meters
static uint8_t gpsRescueConfig_altitudeMode; static uint8_t gpsRescueConfig_altitudeMode;
@ -116,10 +115,10 @@ const OSD_Entry cms_menuGpsRescuePidEntries[] =
{ {
{"--- GPS RESCUE PID---", OME_Label, NULL, NULL}, {"--- GPS RESCUE PID---", OME_Label, NULL, NULL},
{ "ALTITUDE P", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &autopilotConfig_altitude_P, 0, 255, 1 } }, { "ALTITUDE P", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &autopilotConfig_altitude_P, 0, 200, 1 } },
{ "ALTITUDE I", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &autopilotConfig_altitude_I, 0, 255, 1 } }, { "ALTITUDE I", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &autopilotConfig_altitude_I, 0, 200, 1 } },
{ "ALTITUDE D", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &autopilotConfig_altitude_D, 0, 255, 1 } }, { "ALTITUDE D", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &autopilotConfig_altitude_D, 0, 200, 1 } },
{ "ALTITUDE F", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &autopilotConfig_altitude_F, 0, 255, 1 } }, { "ALTITUDE F", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &autopilotConfig_altitude_F, 0, 200, 1 } },
{ "YAW P", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &gpsRescueConfig_yawP, 0, 200, 1 } }, { "YAW P", OME_UINT8 | REBOOT_REQUIRED, NULL, &(OSD_UINT8_t){ &gpsRescueConfig_yawP, 0, 200, 1 } },

2
src/main/fc/init.c
View file

@ -95,7 +95,6 @@
#include "fc/tasks.h" #include "fc/tasks.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/imu.h" #include "flight/imu.h"
@ -104,6 +103,7 @@
#include "flight/pid.h" #include "flight/pid.h"
#include "flight/pid_init.h" #include "flight/pid_init.h"
#include "flight/position.h" #include "flight/position.h"
#include "flight/pos_hold.h"
#include "flight/servos.h" #include "flight/servos.h"
#include "io/asyncfatfs/asyncfatfs.h" #include "io/asyncfatfs/asyncfatfs.h"

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

@ -21,12 +21,12 @@
#ifdef USE_ALT_HOLD_MODE #ifdef USE_ALT_HOLD_MODE
#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/rc.h" #include "fc/rc.h"
#include "fc/runtime_config.h" #include "fc/runtime_config.h"
#include "flight/autopilot.h" #include "flight/autopilot.h"
#include "flight/failsafe.h" #include "flight/failsafe.h"
#include "flight/position.h" #include "flight/position.h"

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

@ -27,7 +27,6 @@
#include "fc/rc.h" #include "fc/rc.h"
#include "flight/imu.h" #include "flight/imu.h"
#include "flight/pid.h"
#include "flight/position.h" #include "flight/position.h"
#include "rx/rx.h" #include "rx/rx.h"
@ -195,10 +194,6 @@ bool isBelowLandingAltitude(void)
return getAltitudeCm() < 100.0f * autopilotConfig()->landing_altitude_m; return getAltitudeCm() < 100.0f * autopilotConfig()->landing_altitude_m;
} }
const pidCoefficient_t *getAltitudePidCoeffs(void)
{
return &altitudePidCoeffs;
float getAutopilotThrottle(void) float getAutopilotThrottle(void)
{ {
return throttleOut; return throttleOut;

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

@ -30,7 +30,6 @@ void resetPositionControl(void);
void altitudeControl(float targetAltitudeCm, float taskIntervalS, float verticalVelocity, float targetAltitudeStep); void altitudeControl(float targetAltitudeCm, float taskIntervalS, float verticalVelocity, float targetAltitudeStep);
void positionControl(gpsLocation_t targetLocation, float deadband); void positionControl(gpsLocation_t targetLocation, float deadband);
bool isBelowLandingAltitude(void); bool isBelowLandingAltitude(void);
const pidCoefficient_t *getAltitudePidCoeffs(void); const pidCoefficient_t *getAltitudePidCoeffs(void);
float getAutopilotThrottle(void); float getAutopilotThrottle(void);

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

@ -53,7 +53,6 @@
#include "flight/mixer_init.h" #include "flight/mixer_init.h"
#include "flight/mixer_tricopter.h" #include "flight/mixer_tricopter.h"
#include "flight/pid.h" #include "flight/pid.h"
#include "flight/autopilot.h"
#include "flight/rpm_filter.h" #include "flight/rpm_filter.h"
#include "io/gps.h" #include "io/gps.h"

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

@ -48,7 +48,6 @@
#include "flight/alt_hold.h" #include "flight/alt_hold.h"
#include "flight/autopilot.h" #include "flight/autopilot.h"
#include "flight/pos_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"

1
src/test/Makefile
View file

@ -478,7 +478,6 @@ althold_unittest_SRC := \
$(USER_DIR)/flight/alt_hold.c \ $(USER_DIR)/flight/alt_hold.c \
$(USER_DIR)/flight/autopilot.c \ $(USER_DIR)/flight/autopilot.c \
$(USER_DIR)/common/maths.c \ $(USER_DIR)/common/maths.c \
$(USER_DIR)/flight/autopilot.c \
$(USER_DIR)/pg/rx.c $(USER_DIR)/pg/rx.c
althold_unittest_DEFINES := \ althold_unittest_DEFINES := \