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

Enable video transmitter tab #3505

Merged
merged 1 commit into from
Jul 10, 2023
Merged

Conversation

haslinghuis
Copy link
Member

@haslinghuis haslinghuis commented Jul 7, 2023

Fixes #3504

  • Fixes backwards compatibility
  • Enables virtual vtx feature if vtx build option is present independent of port settings.

@haslinghuis haslinghuis added this to the 10.10.0 milestone Jul 7, 2023
@haslinghuis haslinghuis self-assigned this Jul 7, 2023
@github-actions

This comment has been minimized.

@blckmn
Copy link
Member

blckmn commented Jul 7, 2023

AUTOMERGE: (FAIL)

  • github identifies PR as mergeable -> FAIL
  • assigned to a milestone -> PASS
  • cooling off period lapsed -> PASS
  • commit count less or equal to three -> PASS
  • Don't merge label NOT found -> PASS
  • at least one RN: label found -> PASS
  • Tested label found -> PASS
  • assigned to an approver -> PASS
  • approver count at least three -> FAIL

@cruwaller
Copy link

Just tested and still no Video Transmitter tab.
There is a warning on Ports tab:

The VTX table has not been set up correctly and without it VTX control will not be possible. Please set up the VTX table in Video Transmitter tab.

quite funny since there are no such a tab :D

Anyway, VTX table is set and works correctly :)

# vtxtable
vtxtable bands 5
vtxtable channels 8
vtxtable band 1 BOSCAM_A A FACTORY    0    0    0    0    0    0    0    0
vtxtable band 2 BOSCAM_B B FACTORY    0    0    0    0    0    0    0    0
vtxtable band 3 BOSCAM_E E FACTORY    0    0    0    0    0    0    0    0
vtxtable band 4 FATSHARK F FACTORY    0 5760    0 5800    0    0    0    0
vtxtable band 5 RACEBAND R FACTORY 5658 5695 5732 5769 5806 5843 5880 5917
vtxtable powerlevels 3
vtxtable powervalues 14 23 0
vtxtable powerlabels 25 200 0

@haslinghuis
Copy link
Member Author

Did you add VTX in Other Options while flashing?

@cruwaller
Copy link

Seriously? As mentioned earlier... Quad works and flies, even the VTX control works as expected :)
I test both 4.4 and latest 4.5 Betaflight versions (two different quads)...

Video Transmitter tab is shown and works correctly with 10.9.0 Configurator version... even the VTX settings can be adjusted correctly with BF4.5.

@haslinghuis
Copy link
Member Author

Added new version

@github-actions

This comment has been minimized.

@haslinghuis haslinghuis changed the title Enable video transmitter tab also for MSP VTX Enable video transmitter tab Jul 7, 2023
@github-actions

This comment has been minimized.

@haslinghuis haslinghuis force-pushed the fix-vtx branch 2 times, most recently from 034c473 to 5b5db27 Compare July 8, 2023 00:08
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@cruwaller
Copy link

Just tested the latest version and VTX tab is missing also for SA and Tramp + still no tab for MSP.

2023-07-08_11-01_no_video_transmitter_tab

@haslinghuis haslinghuis force-pushed the fix-vtx branch 2 times, most recently from d9dd891 to ca17f19 Compare July 8, 2023 10:43
@github-actions

This comment has been minimized.

@haslinghuis
Copy link
Member Author

haslinghuis commented Jul 8, 2023

Need to fix backwards compatibility as the virtual vtx feature only works with 4.5.0
In 4.5.0 vtx build option + port setting tab enables the virtual vtx feature which decides tab visibility.

@github-actions

This comment has been minimized.

@cruwaller
Copy link

Now the VTX tab is shown for both 4.5 and 4.4. Thanks a lot!

@haslinghuis
Copy link
Member Author

Thanks for testing 👍

@haslinghuis
Copy link
Member Author

haslinghuis commented Jul 8, 2023

Cleanup. Rebased & squashed

@sonarcloud
Copy link

sonarcloud bot commented Jul 8, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2023

Do you want to test this code? Here you have an automated build:
Betaflight-Configurator-Android
Betaflight-Configurator-Linux
Betaflight-Configurator-macOS
Betaflight-Configurator-Windows
WARNING: It may be unstable and result in corrupted configurations or data loss. Use only for testing!

Copy link
Member

@freasy freasy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@haslinghuis haslinghuis merged commit ea02a48 into betaflight:master Jul 10, 2023
9 checks passed
@haslinghuis haslinghuis deleted the fix-vtx branch July 10, 2023 13:47
@hydra
Copy link
Contributor

hydra commented Jul 13, 2023

This is still broken for me.

image

image

My use case is an ELRS CRSF RX with built-in SPI-connected VTX.

VTX control seems to work as expected after using the cli to configure vtx tables, but the configurator does not show the Video Transmitter tab.

@haslinghuis
Copy link
Member Author

haslinghuis commented Jul 13, 2023

@hydra please check #3512

Sounds like an interesting board

@cruwaller
Copy link

I faced this same issue again with the latest nightly build yesterday (on linux). Unfortunately that VTX tab handling seems to be still a bit unstable... USE_VTX is still enabled and cli works.
I will retest with #3512 branch.

@haslinghuis
Copy link
Member Author

haslinghuis commented Jul 14, 2023

@cruwaller removed the logic as more code would be required to support, rather just show the tab and reduce maintenance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: COMPLETED
Development

Successfully merging this pull request may close these issues.

VTX configuration is not possible
6 participants