Skip to content

Fixing efficiency symbol and adding units #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dzaro-dev merged 3 commits into from
Jan 21, 2025
Merged

Fixing efficiency symbol and adding units #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaee86c
Update displayport_msp_dji_compat.c
dzaro-dev Jan 20, 2025
dd10e84
Update osd.c
dzaro-dev Jan 20, 2025
c62a732
Fixed typo
dzaro-dev Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions src/main/io/displayport_msp_dji_compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,31 +136,37 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page)

case SYM_DECORATION + 7: // NW pointing arrow
return DJI_SYM_ARROW_11;

/*
case SYM_VTX_POWER:
return DJI_SYM_VTX_POWER;
*/
case SYM_VOLT:
return DJI_SYM_VOLT;

case SYM_MAH:
return DJI_SYM_MAH;

case SYM_AH_KM:
return DJI_SYM_KM;

case SYM_AH_MI:
return DJI_SYM_MI;
/*
case SYM_VTX_POWER:
return DJI_SYM_VTX_POWER;

case SYM_AH_NM:
return DJI_SYM_AH_NM;
return DJI_SYM_MI;

case SYM_AH_KM:
return DJI_SYM_KM;

case SYM_MAH_MI_0:
return DJI_SYM_MAH;

case SYM_MAH_MI_1:
return DJI_SYM_MI;

case SYM_MAH_NM_0:
return DJI_SYM_MAH_NM_0;
return DJI_SYM_MAH;

case SYM_MAH_NM_1:
return DJI_SYM_MAH_NM_1;
*/
return DJI_SYM_MI;

case SYM_MAH_KM_0:
return DJI_SYM_MAH;

Expand Down Expand Up @@ -193,7 +199,16 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page)

case SYM_AMP:
return DJI_SYM_AMP;

case SYM_WATT:
return DJI_SYM_WATT;
/*
case SYM_MW:
return DJI_SYM_MW;

case SYM_KILOWATT:
return DJI_SYM_KILOWATT;

case SYM_WH:
return DJI_SYM_WH;

Expand All @@ -205,15 +220,6 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page)

case SYM_WH_NM:
return DJI_SYM_WH_NM;
*/
case SYM_WATT:
return DJI_SYM_WATT;
/*
case SYM_MW:
return DJI_SYM_MW;

case SYM_KILOWATT:
return DJI_SYM_KILOWATT;
*/
case SYM_FT:
return DJI_SYM_FT;
Expand Down Expand Up @@ -298,12 +304,6 @@ uint8_t getDJICharacter(uint8_t ch, uint8_t page)
/*
case SYM_KT:
return DJI_SYM_KT

case SYM_MAH_MI_0:
return DJI_SYM_MAH_MI_0;

case SYM_MAH_MI_1:
return DJI_SYM_MAH_MI_1;
*/
case SYM_THR:
return DJI_SYM_THR;
Expand Down
39 changes: 21 additions & 18 deletions src/main/io/osd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3401,45 +3401,48 @@ static bool osdDrawSingleElement(uint8_t item)
case OSD_UNIT_IMPERIAL:
moreThanAh = osdFormatCentiNumber(buff, value * METERS_PER_MILE / 10, 1000, 0, 2, digits, false);
if (!moreThanAh) {
tfp_sprintf(buff + strlen(buff), "%c%c", SYM_MAH_MI_0, SYM_MAH_MI_1);
tfp_sprintf(buff + strlen(buff), "%c/%c", SYM_MAH_MI_0, SYM_MAH_MI_1);
} else {
tfp_sprintf(buff + strlen(buff), "%c", SYM_AH_MI);
}
if (!efficiencyValid) {
buff[0] = buff[1] = buff[2] = buff[3] = '-';
buff[digits] = SYM_MAH_MI_0; // This will overwrite the "-" at buff[3] if not in DJICOMPAT mode
buff[digits + 1] = SYM_MAH_MI_1;
buff[digits + 2] = '\0';
buff[digits + 1] = '/';
buff[digits + 2] = SYM_MAH_MI_1;
buff[digits + 3] = '\0';
}
break;
case OSD_UNIT_GA:
moreThanAh = osdFormatCentiNumber(buff, value * METERS_PER_NAUTICALMILE / 10, 1000, 0, 2, digits, false);
if (!moreThanAh) {
tfp_sprintf(buff + strlen(buff), "%c%c", SYM_MAH_NM_0, SYM_MAH_NM_1);
tfp_sprintf(buff + strlen(buff), "%c/%c", SYM_MAH_NM_0, SYM_MAH_NM_1);
} else {
tfp_sprintf(buff + strlen(buff), "%c", SYM_AH_NM);
}
if (!efficiencyValid) {
buff[0] = buff[1] = buff[2] = buff[3] = '-';
buff[digits] = SYM_MAH_NM_0;
buff[digits + 1] = SYM_MAH_NM_1;
buff[digits + 2] = '\0';
buff[digits + 1] = '/';
buff[digits + 2] = SYM_MAH_NM_1;
buff[digits + 3] = '\0';
}
break;
case OSD_UNIT_METRIC_MPH:
FALLTHROUGH;
case OSD_UNIT_METRIC:
moreThanAh = osdFormatCentiNumber(buff, value * 100, 1000, 0, 2, digits, false);
if (!moreThanAh) {
tfp_sprintf(buff + strlen(buff), "%c%c", SYM_MAH_KM_0, SYM_MAH_KM_1);
tfp_sprintf(buff + strlen(buff), "%c/%c", SYM_MAH_KM_0, SYM_MAH_KM_1);
} else {
tfp_sprintf(buff + strlen(buff), "%c", SYM_AH_KM);
}
if (!efficiencyValid) {
buff[0] = buff[1] = buff[2] = buff[3] = '-';
buff[digits] = SYM_MAH_KM_0;
buff[digits + 1] = SYM_MAH_KM_1;
buff[digits + 2] = '\0';
buff[digits + 1] = '/';
buff[digits + 2] = SYM_MAH_KM_1;
buff[digits + 3] = '\0';
}
break;
}
Expand Down Expand Up @@ -4960,7 +4963,7 @@ uint8_t drawStat_AverageEfficiency(uint8_t col, uint8_t row, uint8_t statValX, b
strcat(outBuff, osdFormatTrimWhiteSpace(buff));
if (osdDisplayIsHD()) {
if (!moreThanAh)
tfp_sprintf(outBuff + strlen(outBuff), "%c%c", SYM_MAH_MI_0, SYM_MAH_MI_1);
tfp_sprintf(outBuff + strlen(outBuff), "%c/%c", SYM_MAH_MI_0, SYM_MAH_MI_1);
else
tfp_sprintf(outBuff + strlen(outBuff), "%c", SYM_AH_MI);

Expand All @@ -4972,11 +4975,11 @@ uint8_t drawStat_AverageEfficiency(uint8_t col, uint8_t row, uint8_t statValX, b
strcat(outBuff, osdFormatTrimWhiteSpace(buff));

if (!moreThanAh)
tfp_sprintf(outBuff + strlen(outBuff), "%c%c", SYM_MAH_MI_0, SYM_MAH_MI_1);
tfp_sprintf(outBuff + strlen(outBuff), "%c/%c", SYM_MAH_MI_0, SYM_MAH_MI_1);
else
tfp_sprintf(outBuff + strlen(outBuff), "%c", SYM_AH_MI);
} else {
tfp_sprintf(outBuff + strlen(outBuff), "---/---%c%c", SYM_MAH_MI_0, SYM_MAH_MI_1);
tfp_sprintf(outBuff + strlen(outBuff), "---/---%c/%c", SYM_MAH_MI_0, SYM_MAH_MI_1);
}
} else {
if (efficiencyValid) {
Expand All @@ -4998,7 +5001,7 @@ uint8_t drawStat_AverageEfficiency(uint8_t col, uint8_t row, uint8_t statValX, b
strcat(outBuff, osdFormatTrimWhiteSpace(buff));
if (osdDisplayIsHD()) {
if (!moreThanAh)
tfp_sprintf(outBuff + strlen(outBuff), "%c%c", SYM_MAH_NM_0, SYM_MAH_NM_1);
tfp_sprintf(outBuff + strlen(outBuff), "%c/%c", SYM_MAH_NM_0, SYM_MAH_NM_1);
else
tfp_sprintf(outBuff + strlen(outBuff), "%c", SYM_AH_NM);

Expand All @@ -5009,12 +5012,12 @@ uint8_t drawStat_AverageEfficiency(uint8_t col, uint8_t row, uint8_t statValX, b
moreThanAh = moreThanAh || osdFormatCentiNumber(buff, (int32_t)(getMAhDrawn() * 10000.0f * METERS_PER_NAUTICALMILE / totalDistance), 1000, 0, 2, digits, false);
strcat(outBuff, osdFormatTrimWhiteSpace(buff));
if (!moreThanAh) {
tfp_sprintf(outBuff + strlen(outBuff), "%c%c", SYM_MAH_NM_0, SYM_MAH_NM_1);
tfp_sprintf(outBuff + strlen(outBuff), "%c/%c", SYM_MAH_NM_0, SYM_MAH_NM_1);
} else {
tfp_sprintf(outBuff + strlen(outBuff), "%c", SYM_AH_NM);
}
} else {
tfp_sprintf(outBuff + strlen(outBuff), "---/---%c%c", SYM_MAH_NM_0, SYM_MAH_NM_1);
tfp_sprintf(outBuff + strlen(outBuff), "---/---%c/%c", SYM_MAH_NM_0, SYM_MAH_NM_1);
}
} else {
if (efficiencyValid) {
Expand Down Expand Up @@ -5043,7 +5046,7 @@ uint8_t drawStat_AverageEfficiency(uint8_t col, uint8_t row, uint8_t statValX, b
strcat(outBuff, osdFormatTrimWhiteSpace(buff));
if (osdDisplayIsHD()) {
if (!moreThanAh)
tfp_sprintf(outBuff + strlen(outBuff), "%c%c", SYM_MAH_KM_0, SYM_MAH_KM_1);
tfp_sprintf(outBuff + strlen(outBuff), "%c/%c", SYM_MAH_KM_0, SYM_MAH_KM_1);
else
tfp_sprintf(outBuff + strlen(outBuff), "%c", SYM_AH_KM);

Expand All @@ -5054,12 +5057,12 @@ uint8_t drawStat_AverageEfficiency(uint8_t col, uint8_t row, uint8_t statValX, b
moreThanAh = moreThanAh || osdFormatCentiNumber(buff, (int32_t)(getMAhDrawn() * 10000000.0f / totalDistance), 1000, 0, 2, digits, false);
strcat(outBuff, osdFormatTrimWhiteSpace(buff));
if (!moreThanAh) {
tfp_sprintf(outBuff + strlen(outBuff), "%c%c", SYM_MAH_KM_0, SYM_MAH_KM_1);
tfp_sprintf(outBuff + strlen(outBuff), "%c/%c", SYM_MAH_KM_0, SYM_MAH_KM_1);
} else {
tfp_sprintf(outBuff + strlen(outBuff), "%c", SYM_AH_KM);
}
} else {
tfp_sprintf(outBuff + strlen(outBuff), "---/---%c%c", SYM_MAH_KM_0, SYM_MAH_KM_1);
tfp_sprintf(outBuff + strlen(outBuff), "---/---%c/%c", SYM_MAH_KM_0, SYM_MAH_KM_1);
}
} else {
if (efficiencyValid) {
Expand Down
Loading