Skip to content
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.

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

Backport OSD extended link stats to 4.5.x #26912

Open
wants to merge 4 commits into
base: Plane-4.5
Choose a base branch
from

Conversation

rmaia3d
Copy link
Contributor

@rmaia3d rmaia3d commented Apr 28, 2024

Backport the extended OSD link stats panels (added by #25844) to the 4.5.x versions.

This is currently only implemented for CRSF protocol based radio systems, TBS Crossfire and ELRS.

@tridge
Copy link
Contributor

tridge commented May 1, 2024

@rmaia3d thanks! i'll add it to our backport list for consideration

@tridge tridge removed the DevCallEU label May 1, 2024
@rmackay9
Copy link
Contributor

rmackay9 commented May 1, 2024

We discussed this on the dev call and I think we plan to include in 4.5.3 so we will delay merging this until 4.5.2 has been released.

By the way, if you rebase on Copter-4.5 it will probably pass CI.

@rmaia3d
Copy link
Contributor Author

rmaia3d commented May 2, 2024

We discussed this on the dev call and I think we plan to include in 4.5.3 so we will delay merging this until 4.5.2 has been released.

By the way, if you rebase on Copter-4.5 it will probably pass CI.

Ok! Great! Anything else that needs to be done on my end, please just let me know.

As a side note, I tried rebasing against Copter-4.5 but I get this merge conflict:

image

It's apparently nothing critical:

image

But I'm not sure if I change this on this rebase, it will create further problems down the line.

@rmaia3d rmaia3d force-pushed the pr/4.5/osd_lnk_stats branch from 6b14f48 to 344af96 Compare May 15, 2024 22:06
lida2003 added a commit to SnapDragonfly/ardupilot that referenced this pull request Jun 17, 2024
@rmaia3d rmaia3d force-pushed the pr/4.5/osd_lnk_stats branch from 344af96 to ac97e25 Compare June 17, 2024 15:36
rmaia3d added 4 commits June 17, 2024 12:36
Adds RSSI dBm, SNR, LQ, Tx power and active antenna OSD fields
Adds RSSI dBm, SNR, LQ, Tx power and active antenna OSD fields
Adds RSSI dBm, SNR, LQ, Tx power and active antenna OSD fields
Adds RSSI dBm, SNR, LQ, Tx power and active antenna OSD fields
@lida2003
Copy link
Contributor

lida2003 commented Jun 18, 2024

@peterbarker
Copy link
Contributor

@rmaia3d this one needs a rebase

@andyp1per
Copy link
Collaborator

Didn't we already do that? My bad if this did not get backported

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: 4.5.5-beta1
Development

Successfully merging this pull request may close these issues.

6 participants