From eaee86c728e0bf09ed12e0b01f99988b610fa570 Mon Sep 17 00:00:00 2001 From: dzaro-dev <23706061+dzaro-dev@users.noreply.github.com> Date: Mon, 20 Jan 2025 21:26:32 +0000 Subject: [PATCH 1/3] Update displayport_msp_dji_compat.c Reworked and rearranged some icons and added some additional ones. --- src/main/io/displayport_msp_dji_compat.c | 52 ++++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/io/displayport_msp_dji_compat.c b/src/main/io/displayport_msp_dji_compat.c index d8e0f93dac3..0e7283d69ad 100644 --- a/src/main/io/displayport_msp_dji_compat.c +++ b/src/main/io/displayport_msp_dji_compat.c @@ -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; @@ -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; @@ -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; @@ -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; From dd10e8469309a78b2d9e83299b0a1d15b18a93d8 Mon Sep 17 00:00:00 2001 From: dzaro-dev <23706061+dzaro-dev@users.noreply.github.com> Date: Mon, 20 Jan 2025 21:31:02 +0000 Subject: [PATCH 2/3] Update osd.c Added forwardslash to efficiency and enabled imperial units. --- src/main/io/osd.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/src/main/io/osd.c b/src/main/io/osd.c index aa9fcfde41f..b58ac5bc921 100644 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -3401,29 +3401,31 @@ 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: @@ -3431,15 +3433,16 @@ static bool osdDrawSingleElement(uint8_t item) 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; } @@ -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); @@ -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) { @@ -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); @@ -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) { @@ -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); @@ -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) { From c62a73249d530e798370f991d5bca5afb468a21f Mon Sep 17 00:00:00 2001 From: dzaro-dev <23706061+dzaro-dev@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:59:14 +0100 Subject: [PATCH 3/3] Fixed typo --- src/main/io/osd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/io/osd.c b/src/main/io/osd.c index b58ac5bc921..17c4fd87a59 100644 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -3408,7 +3408,7 @@ static bool osdDrawSingleElement(uint8_t item) 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] = '/' + buff[digits + 1] = '/'; buff[digits + 2] = SYM_MAH_MI_1; buff[digits + 3] = '\0'; }