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

Merge pull request #11896 from ctzsnooze/fix-beeper-ready-beep-on-gps-home-fix

Browse source 
Beeper READY_BEEP when home fix is first achieved
This commit is contained in:
haslinghuis 2022-10-17 21:01:52 +02:00 • committed by GitHub
commit dc48259f16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/main/io/gps.c
View file

@ -870,7 +870,9 @@ void gpsUpdate(timeUs_t currentTimeUs)
if (sensors(SENSOR_GPS)) { if (sensors(SENSOR_GPS)) {
updateGpsIndicator(currentTimeUs); updateGpsIndicator(currentTimeUs);
} }
if (!ARMING_FLAG(ARMED) && !gpsConfig()->gps_set_home_point_once) { if (!ARMING_FLAG(ARMED) && !gpsConfig()->gps_set_home_point_once) {
// clear the home fix icon between arms if the user configuration is to reset home point between arms
DISABLE_STATE(GPS_FIX_HOME); DISABLE_STATE(GPS_FIX_HOME);
} }
@ -880,15 +882,14 @@ void gpsUpdate(timeUs_t currentTimeUs)
} }
#endif #endif
static bool hasFix = false; static bool hasBeeped = false;
if (STATE(GPS_FIX_HOME)) { if (!ARMING_FLAG(ARMED)) {
if (gpsIsHealthy() && gpsSol.numSat >= gpsConfig()->gpsRequiredSats && !hasFix) { // while disarmed, beep when requirements for a home fix are met
// ready beep sequence on fix or requirements for gps rescue met. // ?? should we also beep if home fix requirements first appear after arming?
if (!hasBeeped && STATE(GPS_FIX) && gpsSol.numSat >= gpsConfig()->gpsRequiredSats) {
beeper(BEEPER_READY_BEEP); beeper(BEEPER_READY_BEEP);
hasFix = true; hasBeeped = true;
} }
} else {
hasFix = false;
} }
executeTimeUs = micros() - currentTimeUs; executeTimeUs = micros() - currentTimeUs;
@ -1806,15 +1807,19 @@ static void GPS_calculateDistanceFlownVerticalSpeed(bool initialize)
} }
void GPS_reset_home_position(void) void GPS_reset_home_position(void)
// runs, if GPS is defined, on arming via tryArm() in core.c, and on gyro cal via processRcStickPositions() in rc_controls.c
{ {
if (!STATE(GPS_FIX_HOME) || !gpsConfig()->gps_set_home_point_once) { if (!STATE(GPS_FIX_HOME) || !gpsConfig()->gps_set_home_point_once) {
if (STATE(GPS_FIX) && gpsSol.numSat >= gpsConfig()->gpsRequiredSats) { if (STATE(GPS_FIX) && gpsSol.numSat >= gpsConfig()->gpsRequiredSats) {
// requires the full sat count to say we have a home fix // those checks are always true for tryArm, but may not be true for gyro cal
GPS_home[GPS_LATITUDE] = gpsSol.llh.lat; GPS_home[GPS_LATITUDE] = gpsSol.llh.lat;
GPS_home[GPS_LONGITUDE] = gpsSol.llh.lon; GPS_home[GPS_LONGITUDE] = gpsSol.llh.lon;
GPS_calc_longitude_scaling(gpsSol.llh.lat); GPS_calc_longitude_scaling(gpsSol.llh.lat);
// need an initial value for distance and bearing calcs, and to set ground altitude
ENABLE_STATE(GPS_FIX_HOME); ENABLE_STATE(GPS_FIX_HOME);
// no point beeping success here since:
// when triggered by tryArm, the arming beep is modified to indicate the GPS home fix status on arming, and
// when triggered by gyro cal, the gyro cal beep takes priority over the GPS beep, so we won't hear the GPS beep
// PS: to test for gyro cal, check for !ARMED, since we cannot be here while disarmed other than via gyro cal
} }
} }
GPS_calculateDistanceFlownVerticalSpeed(true); // Initialize GPS_calculateDistanceFlownVerticalSpeed(true); // Initialize