diff --git a/src/main/flight/gps_rescue.c b/src/main/flight/gps_rescue.c index f3db7e2dbe..30ce7e9073 100644 --- a/src/main/flight/gps_rescue.c +++ b/src/main/flight/gps_rescue.c @@ -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; diff --git a/src/main/flight/gps_rescue.h b/src/main/flight/gps_rescue.h index f29eafa482..b1b575bac9 100644 --- a/src/main/flight/gps_rescue.h +++ b/src/main/flight/gps_rescue.h @@ -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); diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c index 24b714e902..9720c9c067 100644 --- a/src/main/msp/msp.c +++ b/src/main/msp/msp.c @@ -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);