rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove blank overwrite in the OSD (#8416) 

Remove blank overwrite in the OSD
This commit is contained in:
Michael Keller 2019-06-14 00:31:29 +12:00 committed by GitHub
parent 7b7250a811 fdc6aab7a9
commit 7b2bdf304e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/osd/osd_elements.c
View File

@ -240,16 +240,6 @@ static void osdFormatCoordinate(char *buff, char sym, int32_t val)
}
#endif // USE_GPS
static void osdFormatMessage(char *buff, size_t size, const char *message)
{
memset(buff, SYM_BLANK, size);
if (message) {
memcpy(buff, message, strlen(message));
}
// Ensure buff is zero terminated
buff[size - 1] = '\0';
}
static void osdFormatPID(char * buff, const char * label, const pidf_t * pid)
{
tfp_sprintf(buff, "%s %3d %3d %3d", label, pid->P, pid->I, pid->D);
@ -474,11 +464,9 @@ static void osdElementAltitude(osdElementParms_t *element)
if (haveBaro || haveGps) {
osdFormatAltitudeString(element->buff, getEstimatedAltitudeCm());
} else {
// We use this symbol when we don't have a valid measure
element->buff[0] = SYM_COLON;
// overwrite any previous altitude with blanks
memset(element->buff + 1, SYM_BLANK, 6);
element->buff[7] = '\0';
element->buff[0] = SYM_ALTITUDE;
element->buff[1] = SYM_COLON; // We use this symbol when we don't have a valid measure
element->buff[2] = '\0';
}
}
@ -546,9 +534,6 @@ static void osdElementCoreTemperature(osdElementParms_t *element)
static void osdElementCraftName(osdElementParms_t *element)
{
// This does not strictly support iterative updating if the craft name changes at run time. But since the craft name is not supposed to be changing this should not matter, and blanking the entire length of the craft name string on update will make it impossible to configure elements to be displayed on the right hand side of the craft name.
//TODO: When iterative updating is implemented, change this so the craft name is only printed once whenever the OSD 'flight' screen is entered.
if (strlen(pilotConfig()->name) == 0) {
strcpy(element->buff, "CRAFT_NAME");
} else {
@ -603,11 +588,8 @@ static void osdElementCrashFlipArrow(osdElementParms_t *element)
}
}
}
} else {
element->buff[0] = ' ';
element->buff[1] = '\0';
}
element->buff[1] = '\0';
}
#endif // USE_ACC
@ -639,9 +621,6 @@ static void osdElementDisarmed(osdElementParms_t *element)
static void osdElementDisplayName(osdElementParms_t *element)
{
// This does not strictly support iterative updating if the display name changes at run time. But since the display name is not supposed to be changing this should not matter, and blanking the entire length of the display name string on update will make it impossible to configure elements to be displayed on the right hand side of the display name.
//TODO: When iterative updating is implemented, change this so the display name is only printed once whenever the OSD 'flight' screen is entered.
if (strlen(pilotConfig()->displayName) == 0) {
strcpy(element->buff, "DISPLAY_NAME");
} else {
@ -962,9 +941,7 @@ static void osdElementNumericalVario(osdElementParms_t *element)
} else {
// We use this symbol when we don't have a valid measure
element->buff[0] = SYM_COLON;
// overwrite any previous vertical speed with blanks
memset(element->buff + 1, SYM_BLANK, 6);
element->buff[7] = '\0';
element->buff[1] = '\0';
}
}
#endif // USE_VARIO
@ -1138,7 +1115,7 @@ static void osdElementWarnings(osdElementParms_t *element)
} while (!(flags & (1 << armingDisabledDisplayIndex)));
}
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, armingDisableFlagNames[armingDisabledDisplayIndex]);
tfp_sprintf(element->buff, "%s", armingDisableFlagNames[armingDisabledDisplayIndex]);
return;
} else {
armingDisabledUpdateTimeUs = 0;
@ -1152,24 +1129,22 @@ static void osdElementWarnings(osdElementParms_t *element)
armingDelayTime = 0;
}
if (armingDelayTime >= (DSHOT_BEACON_GUARD_DELAY_US / 1e5 - 5)) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, " BEACON ON"); // Display this message for the first 0.5 seconds
tfp_sprintf(element->buff, " BEACON ON"); // Display this message for the first 0.5 seconds
} else {
char armingDelayMessage[OSD_FORMAT_MESSAGE_BUFFER_SIZE];
tfp_sprintf(armingDelayMessage, "ARM IN %d.%d", armingDelayTime / 10, armingDelayTime % 10);
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, armingDelayMessage);
tfp_sprintf(element->buff, "ARM IN %d.%d", armingDelayTime / 10, armingDelayTime % 10);
}
return;
}
#endif // USE_DSHOT
if (osdWarnGetState(OSD_WARNING_FAIL_SAFE) && failsafeIsActive()) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "FAIL SAFE");
tfp_sprintf(element->buff, "FAIL SAFE");
SET_BLINK(OSD_WARNINGS);
return;
}
// Warn when in flip over after crash mode
if (osdWarnGetState(OSD_WARNING_CRASH_FLIP) && isFlipOverAfterCrashActive()) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "CRASH FLIP");
tfp_sprintf(element->buff, "CRASH FLIP");
return;
}
@ -1178,14 +1153,12 @@ static void osdElementWarnings(osdElementParms_t *element)
if (osdWarnGetState(OSD_WARNING_LAUNCH_CONTROL) && isLaunchControlActive()) {
#ifdef USE_ACC
if (sensors(SENSOR_ACC)) {
char launchControlMsg[OSD_FORMAT_MESSAGE_BUFFER_SIZE];
const int pitchAngle = constrain((attitude.raw[FD_PITCH] - accelerometerConfig()->accelerometerTrims.raw[FD_PITCH]) / 10, -90, 90);
tfp_sprintf(launchControlMsg, "LAUNCH %d", pitchAngle);
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, launchControlMsg);
tfp_sprintf(element->buff, "LAUNCH %d", pitchAngle);
} else
#endif // USE_ACC
{
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "LAUNCH");
tfp_sprintf(element->buff, "LAUNCH");
}
return;
}
@ -1193,14 +1166,14 @@ static void osdElementWarnings(osdElementParms_t *element)
// RSSI
if (osdWarnGetState(OSD_WARNING_RSSI) && (getRssiPercent() < osdConfig()->rssi_alarm)) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "RSSI LOW");
tfp_sprintf(element->buff, "RSSI LOW");
SET_BLINK(OSD_WARNINGS);
return;
}
#ifdef USE_RX_RSSI_DBM
// rssi dbm
if (osdWarnGetState(OSD_WARNING_RSSI_DBM) && (getRssiDbm() > osdConfig()->rssi_dbm_alarm)) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "RSSI DBM");
tfp_sprintf(element->buff, "RSSI DBM");
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1209,14 +1182,14 @@ static void osdElementWarnings(osdElementParms_t *element)
#ifdef USE_RX_LINK_QUALITY_INFO
// Link Quality
if (osdWarnGetState(OSD_WARNING_LINK_QUALITY) && (rxGetLinkQualityPercent() < osdConfig()->link_quality_alarm)) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "LINK QUALITY");
tfp_sprintf(element->buff, "LINK QUALITY");
SET_BLINK(OSD_WARNINGS);
return;
}
#endif // USE_RX_LINK_QUALITY_INFO
if (osdWarnGetState(OSD_WARNING_BATTERY_CRITICAL) && batteryState == BATTERY_CRITICAL) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, " LAND NOW");
tfp_sprintf(element->buff, " LAND NOW");
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1227,7 +1200,7 @@ static void osdElementWarnings(osdElementParms_t *element)
gpsRescueIsConfigured() &&
!gpsRescueIsDisabled() &&
!gpsRescueIsAvailable()) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "RESCUE N/A");
tfp_sprintf(element->buff, "RESCUE N/A");
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1239,7 +1212,7 @@ static void osdElementWarnings(osdElementParms_t *element)
statistic_t *stats = osdGetStats();
if (cmpTimeUs(stats->armed_time, OSD_GPS_RESCUE_DISABLED_WARNING_DURATION_US) < 0) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "RESCUE OFF");
tfp_sprintf(element->buff, "RESCUE OFF");
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1249,7 +1222,7 @@ static void osdElementWarnings(osdElementParms_t *element)
// Show warning if in HEADFREE flight mode
if (FLIGHT_MODE(HEADFREE_MODE)) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "HEADFREE");
tfp_sprintf(element->buff, "HEADFREE");
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1257,10 +1230,7 @@ static void osdElementWarnings(osdElementParms_t *element)
#ifdef USE_ADC_INTERNAL
const int16_t coreTemperature = getCoreTemperatureCelsius();
if (osdWarnGetState(OSD_WARNING_CORE_TEMPERATURE) && coreTemperature >= osdConfig()->core_temp_alarm) {
char coreTemperatureWarningMsg[OSD_FORMAT_MESSAGE_BUFFER_SIZE];
tfp_sprintf(coreTemperatureWarningMsg, "CORE %c: %3d%c", SYM_TEMPERATURE, osdConvertTemperatureToSelectedUnit(coreTemperature), osdGetTemperatureSymbolForSelectedUnit());
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, coreTemperatureWarningMsg);
tfp_sprintf(element->buff, "CORE %c: %3d%c", SYM_TEMPERATURE, osdConvertTemperatureToSelectedUnit(coreTemperature), osdGetTemperatureSymbolForSelectedUnit());
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1311,7 +1281,7 @@ static void osdElementWarnings(osdElementParms_t *element)
escWarningMsg[pos] = '\0';
if (escWarningCount > 0) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, escWarningMsg);
tfp_sprintf(element->buff, "%s", escWarningMsg);
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1319,7 +1289,7 @@ static void osdElementWarnings(osdElementParms_t *element)
#endif // USE_ESC_SENSOR
if (osdWarnGetState(OSD_WARNING_BATTERY_WARNING) && batteryState == BATTERY_WARNING) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "LOW BATTERY");
tfp_sprintf(element->buff, "LOW BATTERY");
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1327,7 +1297,7 @@ static void osdElementWarnings(osdElementParms_t *element)
#ifdef USE_RC_SMOOTHING_FILTER
// Show warning if rc smoothing hasn't initialized the filters
if (osdWarnGetState(OSD_WARNING_RC_SMOOTHING) && ARMING_FLAG(ARMED) && !rcSmoothingInitializationComplete()) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "RCSMOOTHING");
tfp_sprintf(element->buff, "RCSMOOTHING");
SET_BLINK(OSD_WARNINGS);
return;
}
@ -1336,17 +1306,16 @@ static void osdElementWarnings(osdElementParms_t *element)
// Show warning if battery is not fresh
if (osdWarnGetState(OSD_WARNING_BATTERY_NOT_FULL) && !ARMING_FLAG(WAS_EVER_ARMED) && (getBatteryState() == BATTERY_OK)
&& getBatteryAverageCellVoltage() < batteryConfig()->vbatfullcellvoltage) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "BATT < FULL");
tfp_sprintf(element->buff, "BATT < FULL");
return;
}
// Visual beeper
if (osdWarnGetState(OSD_WARNING_VISUAL_BEEPER) && osdGetVisualBeeperState()) {
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, " * * * *");
tfp_sprintf(element->buff, " * * * *");
return;
}
osdFormatMessage(element->buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, NULL);
}
// Define the order in which the elements are drawn.

2
src/test/unit/osd_unittest.cc
View File

@ -766,7 +766,7 @@ TEST(OsdTest, TestElementAltitude)
osdRefresh(simulationTime);
// then
displayPortTestBufferSubstring(23, 7, "- ");
displayPortTestBufferSubstring(23, 7, "%c-", SYM_ALTITUDE);
// when
sensorsSet(SENSOR_GPS);