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

Updating changes as requested.

Browse source 
Removal of OSD additions, reorganization of code to comply with BF coding practices.
This commit is contained in:
eggsbenedict 2020-06-09 15:58:49 -04:00
parent e2b3cb0b86
commit 9ab2c5ba0b
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -155,7 +155,6 @@ PG_REGISTER_WITH_RESET_TEMPLATE(gpsRescueConfig_t, gpsRescueConfig, PG_GPS_RESCU
PG_RESET_TEMPLATE(gpsRescueConfig_t, gpsRescueConfig,
.angle = 32,
.initialAltitudeM = 50,
.rescueAltitudeBufferM = 15,
.descentDistanceM = 200,
.rescueGroundspeed = 2000,
.throttleP = 150,
@ -178,6 +177,7 @@ PG_RESET_TEMPLATE(gpsRescueConfig_t, gpsRescueConfig,
.altitudeMode = MAX_ALT,
.ascendRate = 500,
.descendRate = 150,
.rescueAltitudeBufferM = 15,
);
static uint16_t rescueThrottle;

2
src/main/flight/gps_rescue.h
View file

@ -24,7 +24,6 @@
typedef struct gpsRescue_s {
uint16_t angle; //degrees
uint16_t initialAltitudeM; //meters
uint16_t rescueAltitudeBufferM; //meters
uint16_t descentDistanceM; //meters
uint16_t rescueGroundspeed; //centimeters per second
uint16_t throttleP, throttleI, throttleD;
@ -43,6 +42,7 @@ typedef struct gpsRescue_s {
uint8_t altitudeMode;
uint16_t ascendRate;
uint16_t descendRate;
uint16_t rescueAltitudeBufferM; //meters
} gpsRescueConfig_t;
PG_DECLARE(gpsRescueConfig_t, gpsRescueConfig);

2
src/main/msp/msp.c
View file

@ -1384,7 +1384,6 @@ static bool mspProcessOutCommand(int16_t cmdMSP, sbuf_t *dst)
#ifdef USE_GPS_RESCUE
case MSP_GPS_RESCUE:
sbufWriteU16(dst, gpsRescueConfig()->angle);
sbufWriteU16(dst, gpsRescueConfig()->rescueAltitudeBufferM);
sbufWriteU16(dst, gpsRescueConfig()->initialAltitudeM);
sbufWriteU16(dst, gpsRescueConfig()->descentDistanceM);
sbufWriteU16(dst, gpsRescueConfig()->rescueGroundspeed);
@ -2325,7 +2324,6 @@ static mspResult_e mspProcessInCommand(mspDescriptor_t srcDesc, int16_t cmdMSP,
case MSP_SET_GPS_RESCUE:
gpsRescueConfigMutable()->angle = sbufReadU16(src);
gpsRescueConfigMutable()->initialAltitudeM = sbufReadU16(src);
gpsRescueConfigMutable()->rescueAltitudeBufferM = sbufReadU16(src);
gpsRescueConfigMutable()->descentDistanceM = sbufReadU16(src);
gpsRescueConfigMutable()->rescueGroundspeed = sbufReadU16(src);
gpsRescueConfigMutable()->throttleMin = sbufReadU16(src);