AP_MSP: multi screen and stats support for DJI FPV OSD #18396

yaapu · 2021-08-19T23:06:40Z

This adds multiple screens and stats to the DJI MSP Backend.
Support for multiple screens is similar to regular OSD, one has to enable the additional screens with OSDn_ENABLE and switch between them with one of the supported methods defined by OSD_SW_METHOD.

Stats needed a "hack", when a user switches to a screen that has stats enabled with OSDn_STATS_EN = 1, the telemetry for speed, altitude, voltage, current and distance will report min/max values rather than instant values.

The home distance OSD item will alternate every 2 seconds between max home distance and total traveled distance

The message text OSD item will report "STATS hh:mm" where hh:mm is the flight time and just like usual incoming status text messages will be shown with rolling text.

stats panels have to be individually enabled

OSDn_STATS_EN 1.000000, required to enable the new stats feature
OSDn_MESSAGE_EN 1.000000, required to display flight time in stats display mode
OSDn_ALTITUDE_EN 1.000000, shows max altitude
OSDn_BAT_VOLT_EN 1.000000, shows min voltage
OSDn_CURRENT_EN 1.000000, shows max current
OSDn_GSPEED_EN 1.000000, shows max ground speed
OSDn_HOMEDIST_EN 1.000000, alternates max distance from home and total traveled distance every 2 seconds
OSDn_RSSI_EN 1.000000, shows min rssi

Note: to get airspeed max rather than gspeed max just like usual one have to set OSDn_ASPEED_EN =1

A possible layout:

OSD2_ENABLE 1.000000
OSD2_STATS_EN 1.000000
OSD2_MESSAGE_EN 1.000000
OSD2_MESSAGE_X 14.000000
OSD2_MESSAGE_Y 3.000000
OSD2_ARMING_EN 1.000000
OSD2_ARMING_X 12.000000
OSD2_ARMING_Y 0.000000
OSD2_ALTITUDE_EN 1.000000
OSD2_ALTITUDE_X 11.000000
OSD2_ALTITUDE_Y 6.000000
OSD2_BATUSED_EN 1.000000
OSD2_BATUSED_X 12.000000
OSD2_BATUSED_Y 11.000000
OSD2_BAT_VOLT_EN 1.000000
OSD2_BAT_VOLT_X 12.000000
OSD2_BAT_VOLT_Y 8.000000
OSD2_CLK_EN 1.000000
OSD2_CLK_X 12.000000
OSD2_CLK_Y 0.000000
OSD2_CURRENT_EN 1.000000
OSD2_CURRENT_X 11.000000
OSD2_CURRENT_Y 9.000000
OSD2_GPSLAT_EN 1.000000
OSD2_GPSLAT_X 9.000000
OSD2_GPSLAT_Y 13.000000
OSD2_GPSLONG_EN 1.000000
OSD2_GPSLONG_X 9.000000
OSD2_GPSLONG_Y 14.000000
OSD2_GSPEED_EN 1.000000
OSD2_GSPEED_X 13.000000
OSD2_GSPEED_Y 5.000000
OSD2_HOMEDIST_EN 1.000000
OSD2_HOMEDIST_X 13.000000
OSD2_HOMEDIST_Y 7.000000
OSD2_RSSI_EN 1.000000
OSD2_RSSI_X 13.000000
OSD2_RSSI_Y 10.000000

yielding

peterbarker

Light review only

This is going to be cool.

libraries/AP_OSD/AP_OSD_Setting.cpp

libraries/AP_MSP/AP_MSP.cpp

libraries/AP_MSP/AP_MSP.h

libraries/AP_MSP/AP_MSP_Telem_Backend.cpp

libraries/AP_MSP/AP_MSP_Telem_DJI.cpp

libraries/AP_OSD/AP_OSD.h

yaapu · 2021-08-23T17:01:39Z

This version does not automatically enable any stats panels but rather gives the user the freedom to enable and place items on screen individually

peterbarker

Looks like this might need to be rebased on master?

libraries/AP_MSP/AP_MSP_Telem_DJI.cpp

libraries/AP_OSD/AP_OSD.h

peterbarker · 2021-08-24T11:04:58Z

Is it just me or are we blowing a rather large number of parameters that will never be used for all of the _EN stuff?

peterbarker · 2021-08-24T11:14:38Z

There seems to be more flashing when in stats mode than should be including "ACRO" which makes no sense...
and it is claiming 14 satellites when the plane hasn't seen a single one.

yaapu · 2021-08-24T12:31:56Z

Is it just me or are we blowing a rather large number of parameters that will never be used for all of the _EN stuff?

I had the same feeling, there also are quite some zombies among the symbols and fonts, so we really have many more "unused" symbols than one might think by looking at the fonts table.
We should do some cleaning, but who's the "we" ?

yaapu · 2021-08-24T12:32:29Z

There seems to be more flashing when in stats mode than should be including "ACRO" which makes no sense...

not sure I understand this?
Flashing right now is orthogonal to stats mode, it would flash irregardless, are you implying that when stats are enabled we should suspend any kind of flashing?

and it is claiming 14 satellites when the plane hasn't seen a single one.

14 sats when no fix is a known DJI bug, I never really tried to find a hack for it

tridge · 2021-09-15T07:09:31Z

libraries/AP_MSP/AP_MSP.cpp

@@ -43,9 +43,9 @@ const AP_Param::GroupInfo AP_MSP::var_info[] = {
    // @Param: _OPTIONS
    // @DisplayName: MSP OSD Options
    // @Description: A bitmask to set some MSP specific options
-    // @Bitmask: 0:EnableTelemetryMode, 1: DJIWorkarounds


discussed on call, better to remove the DJI option, and use backend choice

@shellixyz any objections in removing the DJI Workaround option altogether and simply enable all DJI workarounds by default? Users should be unaffected

No objection 👍

peterbarker · 2021-09-15T23:54:20Z

Tested locally and works well - thanks, merging!

yaapu added Library NeedsTesting OSD On screen display WikiNeeded needs wiki update labels Aug 19, 2021

yaapu force-pushed the pr/msp_osd_multiscreen branch 6 times, most recently from 895b217 to 1069965 Compare August 22, 2021 10:19

yaapu requested review from peterbarker and andyp1per August 22, 2021 10:20

peterbarker requested changes Aug 23, 2021

View reviewed changes

yaapu force-pushed the pr/msp_osd_multiscreen branch 4 times, most recently from b379d6a to e9f2c9e Compare August 23, 2021 16:49

yaapu removed the NeedsTesting label Aug 23, 2021

yaapu force-pushed the pr/msp_osd_multiscreen branch from e9f2c9e to 3de5508 Compare August 24, 2021 07:19

peterbarker reviewed Aug 24, 2021

View reviewed changes

libraries/AP_MSP/AP_MSP_Telem_DJI.cpp Show resolved Hide resolved

libraries/AP_MSP/AP_MSP_Telem_DJI.cpp Show resolved Hide resolved

libraries/AP_MSP/AP_MSP_Telem_DJI.cpp Outdated Show resolved Hide resolved

libraries/AP_OSD/AP_OSD.h Outdated Show resolved Hide resolved

yaapu force-pushed the pr/msp_osd_multiscreen branch from 3de5508 to 5dc3727 Compare August 24, 2021 16:54

yaapu added the DevCallEU label Aug 25, 2021

tridge assigned peterbarker Aug 25, 2021

tridge removed the DevCallEU label Aug 25, 2021

yaapu force-pushed the pr/msp_osd_multiscreen branch from 5dc3727 to 997bcca Compare August 25, 2021 08:23

yaapu removed the WikiNeeded needs wiki update label Aug 27, 2021

yaapu force-pushed the pr/msp_osd_multiscreen branch 4 times, most recently from 6208cbb to fa5a063 Compare September 3, 2021 14:12

yaapu force-pushed the pr/msp_osd_multiscreen branch 2 times, most recently from 4a35c54 to 180a785 Compare September 6, 2021 14:08

yaapu requested a review from peterbarker September 6, 2021 21:31

yaapu added the DevCallEU label Sep 15, 2021

tridge requested changes Sep 15, 2021

View reviewed changes

tridge removed the DevCallEU label Sep 15, 2021

yaapu force-pushed the pr/msp_osd_multiscreen branch from 180a785 to 4c21415 Compare September 15, 2021 08:24

yaapu added 2 commits September 15, 2021 12:46

AP_MSP: added multi screen and stats support to DJI FPV OSD

f6a4374

AP_OSD: added multi screen and stats support to DJI FPV OSD

6955d11

yaapu force-pushed the pr/msp_osd_multiscreen branch from 4c21415 to 6955d11 Compare September 15, 2021 10:47

peterbarker merged commit 94aba33 into ArduPilot:master Sep 15, 2021

Hwurzburg added a commit to Hwurzburg/ardupilot that referenced this pull request Oct 31, 2022

AP_OSD: fix error in stats screen introduced in ArduPilot#18396

f00e3cb

tridge pushed a commit that referenced this pull request Nov 1, 2022

AP_OSD: fix error in stats screen introduced in #18396

ac9631f

rmackay9 pushed a commit to rmackay9/rmackay9-ardupilot that referenced this pull request Nov 17, 2022

AP_OSD: fix error in stats screen introduced in ArduPilot#18396

3b9b2e3

tridge pushed a commit to tridge/ardupilot that referenced this pull request Nov 21, 2022

AP_OSD: fix error in stats screen introduced in ArduPilot#18396

b398b52

rmackay9 pushed a commit to rmackay9/rmackay9-ardupilot that referenced this pull request Nov 21, 2022

AP_OSD: fix error in stats screen introduced in ArduPilot#18396

834f7e9

rmackay9 pushed a commit to rmackay9/rmackay9-ardupilot that referenced this pull request Nov 21, 2022

AP_OSD: fix error in stats screen introduced in ArduPilot#18396

8fc26ca

tridge pushed a commit that referenced this pull request Nov 21, 2022

AP_OSD: fix error in stats screen introduced in #18396

3b15a67

rmackay9 pushed a commit that referenced this pull request Nov 21, 2022

AP_OSD: fix error in stats screen introduced in #18396

3e7c1ca

rmackay9 pushed a commit that referenced this pull request Nov 21, 2022

AP_OSD: fix error in stats screen introduced in #18396

b82dda5

obox-tech pushed a commit to obox-tech/ardupilot that referenced this pull request Dec 4, 2022

AP_OSD: fix error in stats screen introduced in ArduPilot#18396

7ce6241

Hwurzburg mentioned this pull request Nov 19, 2023

AP_MSP: update option metadata for clarity #25580

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AP_MSP: multi screen and stats support for DJI FPV OSD #18396

AP_MSP: multi screen and stats support for DJI FPV OSD #18396

yaapu commented Aug 19, 2021 •

edited

peterbarker left a comment

yaapu commented Aug 23, 2021

peterbarker left a comment

peterbarker commented Aug 24, 2021

peterbarker commented Aug 24, 2021

yaapu commented Aug 24, 2021

yaapu commented Aug 24, 2021 •

edited

tridge Sep 15, 2021

yaapu Sep 15, 2021

shellixyz Sep 15, 2021

peterbarker commented Sep 15, 2021

AP_MSP: multi screen and stats support for DJI FPV OSD #18396

AP_MSP: multi screen and stats support for DJI FPV OSD #18396

Conversation

yaapu commented Aug 19, 2021 • edited

peterbarker left a comment

Choose a reason for hiding this comment

yaapu commented Aug 23, 2021

peterbarker left a comment

Choose a reason for hiding this comment

peterbarker commented Aug 24, 2021

peterbarker commented Aug 24, 2021

yaapu commented Aug 24, 2021

yaapu commented Aug 24, 2021 • edited

tridge Sep 15, 2021

Choose a reason for hiding this comment

yaapu Sep 15, 2021

Choose a reason for hiding this comment

shellixyz Sep 15, 2021

Choose a reason for hiding this comment

peterbarker commented Sep 15, 2021

yaapu commented Aug 19, 2021 •

edited

yaapu commented Aug 24, 2021 •

edited