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

Merge pull request #10726 from TonyBlit/osd_sats_none

Browse source
This commit is contained in:
Michael Keller 2021-05-18 00:58:32 +12:00 • committed by GitHub
commit bcc9ff4f02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 85 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/osd/osd_elements.c
View file

@ -1057,16 +1057,24 @@ static void osdElementGpsCoordinate(osdElementParms_t *element)
static void osdElementGpsSats(osdElementParms_t *element)
{
int pos = tfp_sprintf(element->buff, "%c%c%2d", SYM_SAT_L, SYM_SAT_R, gpsSol.numSat);
if (osdConfig()->gps_sats_show_hdop) { // add on the GPS module HDOP estimate
element->buff[pos++] = ' ';
osdPrintFloat(element->buff + pos, SYM_NONE, gpsSol.hdop / 100.0f, "", 1, true, SYM_NONE);
if (!gpsIsHealthy()) {
tfp_sprintf(element->buff, "%c%cNC", SYM_SAT_L, SYM_SAT_R);
} else {
int pos = tfp_sprintf(element->buff, "%c%c%2d", SYM_SAT_L, SYM_SAT_R, gpsSol.numSat);
if (osdConfig()->gps_sats_show_hdop) { // add on the GPS module HDOP estimate
element->buff[pos++] = ' ';
osdPrintFloat(element->buff + pos, SYM_NONE, gpsSol.hdop / 100.0f, "", 1, true, SYM_NONE);
}
}
}
static void osdElementGpsSpeed(osdElementParms_t *element)
{
tfp_sprintf(element->buff, "%c%3d%c", SYM_SPEED, osdGetSpeedToSelectedUnit(gpsConfig()->gps_use_3d_speed ? gpsSol.speed3d : gpsSol.groundSpeed), osdGetSpeedToSelectedUnitSymbol());
if (STATE(GPS_FIX)) {
tfp_sprintf(element->buff, "%c%3d%c", SYM_SPEED, osdGetSpeedToSelectedUnit(gpsConfig()->gps_use_3d_speed ? gpsSol.speed3d : gpsSol.groundSpeed), osdGetSpeedToSelectedUnitSymbol());
} else {
tfp_sprintf(element->buff, "%c%c%c", SYM_SPEED, SYM_HYPHEN, osdGetSpeedToSelectedUnitSymbol());
}
}
static void osdElementEfficiency(osdElementParms_t *element)

1
src/test/unit/link_quality_unittest.cc
View file

@ -445,6 +445,7 @@ extern "C" {
bool areMotorsRunning(void){ return true; }
bool pidOsdAntiGravityActive(void) { return false; }
bool failsafeIsActive(void) { return false; }
bool gpsIsHealthy(void) { return true; }
bool gpsRescueIsConfigured(void) { return false; }
int8_t calculateThrottlePercent(void) { return 0; }
uint32_t persistentObjectRead(persistentObjectId_e) { return 0; }

71
src/test/unit/osd_unittest.cc
View file

@ -104,6 +104,7 @@ extern "C" {
int32_t simulationAltitude;
int32_t simulationVerticalSpeed;
uint16_t simulationCoreTemperature;
bool simulationGpsHealthy;
}
uint32_t simulationFeatureFlags = FEATURE_GPS;
@ -130,6 +131,7 @@ void setDefaultSimulationState()
simulationAltitude = 0;
simulationVerticalSpeed = 0;
simulationCoreTemperature = 0;
simulationGpsHealthy = false;
rcData[PITCH] = 1500;
@ -1134,6 +1136,74 @@ TEST_F(OsdTest, TestConvertTemperatureUnits)
EXPECT_EQ(osdConvertTemperatureToSelectedUnit(41), 106);
}
TEST_F(OsdTest, TestGpsElements)
{
// given
osdElementConfigMutable()->item_pos[OSD_GPS_SATS] = OSD_POS(2, 4) | OSD_PROFILE_1_FLAG;
sensorsSet(SENSOR_GPS);
osdAnalyzeActiveElements();
// when
simulationGpsHealthy = false;
gpsSol.numSat = 0;
displayClearScreen(&testDisplayPort);
osdRefresh(simulationTime);
// then
// Sat indicator should blink and show "NC"
for (int i = 0; i < 15; i++) {
// Blinking should happen at 5Hz
simulationTime += 0.2e6;
osdRefresh(simulationTime);
if (i % 2 == 0) {
displayPortTestBufferSubstring(2, 4, "%c%cNC", SYM_SAT_L, SYM_SAT_R);
} else {
displayPortTestBufferIsEmpty();
}
}
// when
simulationGpsHealthy = true;
gpsSol.numSat = 0;
displayClearScreen(&testDisplayPort);
osdRefresh(simulationTime);
// then
// Sat indicator should blink and show "0"
for (int i = 0; i < 15; i++) {
// Blinking should happen at 5Hz
simulationTime += 0.2e6;
osdRefresh(simulationTime);
if (i % 2 == 0) {
displayPortTestBufferSubstring(2, 4, "%c%c 0", SYM_SAT_L, SYM_SAT_R);
} else {
displayPortTestBufferIsEmpty();
}
}
// when
simulationGpsHealthy = true;
gpsSol.numSat = 10;
displayClearScreen(&testDisplayPort);
osdRefresh(simulationTime);
// then
// Sat indicator should show "10" without flashing
for (int i = 0; i < 15; i++) {
// Blinking should happen at 5Hz
simulationTime += 0.2e6;
osdRefresh(simulationTime);
displayPortTestBufferSubstring(2, 4, "%c%c10", SYM_SAT_L, SYM_SAT_R);
}
}
// STUBS
extern "C" {
bool featureIsEnabled(uint32_t f) { return simulationFeatureFlags & f; }
@ -1242,6 +1312,7 @@ extern "C" {
bool pidOsdAntiGravityActive(void) { return false; }
bool failsafeIsActive(void) { return false; }
bool gpsRescueIsConfigured(void) { return false; }
bool gpsIsHealthy(void) { return simulationGpsHealthy; }
int8_t calculateThrottlePercent(void) { return 0; }
uint32_t persistentObjectRead(persistentObjectId_e) { return 0; }
void persistentObjectWrite(persistentObjectId_e, uint32_t) {}