1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00

remove gps_required and gps_minimum sats and revert to gps_rescue_min_sats

This commit is contained in:
ctzsnooze 2022-10-19 15:58:54 +11:00
parent c5468981e6
commit 341d65becf
22 changed files with 41 additions and 63 deletions

View file

@ -93,7 +93,7 @@ extern "C" {
PG_REGISTER(gpsRescueConfig_t, gpsRescueConfig, PG_GPS_RESCUE, 0);
PG_REGISTER(imuConfig_t, imuConfig, PG_IMU_CONFIG, 0);
PG_REGISTER(gpsConfig_t, gpsConfig, PG_GPS_CONFIG, 0);
timeUs_t simulationTime = 0;
batteryState_e simulationBatteryState;
uint8_t simulationBatteryCellCount;
@ -1193,8 +1193,6 @@ TEST_F(OsdTest, TestGpsElements)
{
// given
osdElementConfigMutable()->item_pos[OSD_GPS_SATS] = OSD_POS(2, 4) | OSD_PROFILE_1_FLAG;
gpsConfigMutable()->gpsMinimumSats = GPS_MINIMUM_SAT_COUNT;
gpsConfigMutable()->gpsRequiredSats = GPS_REQUIRED_SAT_COUNT;
sensorsSet(SENSOR_GPS);
osdAnalyzeActiveElements();

View file

@ -22,26 +22,33 @@ extern "C" {
#include "build/debug.h"
#include "common/maths.h"
#include "common/streambuf.h"
#include "config/feature.h"
#include "config/config.h"
#include "fc/controlrate_profile.h"
#include "fc/core.h"
#include "fc/rc_controls.h"
#include "fc/rc_modes.h"
#include "fc/runtime_config.h"
#include "flight/failsafe.h"
#include "flight/imu.h"
#include "flight/mixer.h"
#include "flight/pid.h"
#include "flight/servos.h"
#include "flight/gps_rescue.h"
#include "io/beeper.h"
#include "io/gps.h"
#include "io/vtx.h"
#include "pg/motor.h"
#include "pg/pg.h"
#include "pg/pg_ids.h"
#include "pg/rx.h"
#include "rx/rx.h"
#include "scheduler/scheduler.h"
#include "sensors/acceleration.h"
#include "sensors/gyro.h"
@ -61,7 +68,7 @@ extern "C" {
PG_REGISTER(failsafeConfig_t, failsafeConfig, PG_FAILSAFE_CONFIG, 0);
PG_REGISTER(motorConfig_t, motorConfig, PG_MOTOR_CONFIG, 0);
PG_REGISTER(imuConfig_t, imuConfig, PG_IMU_CONFIG, 0);
PG_REGISTER(gpsConfig_t, gpsConfig, PG_GPS_CONFIG, 0);
PG_REGISTER(gpsRescueConfig_t, gpsRescueConfig, PG_GPS_CONFIG, 0);
float rcCommand[4];
float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT];