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.

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

Jump to bottom

fix: expose OSD for virtual FC to pick up #3025

Merged
merged 1 commit into from
Sep 28, 2022
Merged

fix: expose OSD for virtual FC to pick up #3025

merged 1 commit into from
Sep 28, 2022

Conversation

chmelevskij
Copy link
Member

Closes #3023

@chmelevskij chmelevskij marked this pull request as ready for review September 21, 2022 05:42
@sonarcloud
Copy link

sonarcloud bot commented Sep 21, 2022

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

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!

McGiverGim
McGiverGim reviewed Sep 21, 2022
View reviewed changes
src/js/tabs/osd.js
Comment on lines 3327 to +3328
window.TABS.osd = osd;
window.OSD = OSD;
Copy link
Member

Choose a reason for hiding this comment

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

Maybe is better to modify in the VirtualFC file:

betaflight-configurator/src/js/VirtualFC.js

Line 179 in db99a98

const virtualOSD = OSD;

Modify const virtualOSD = OSD by const virtualOSD = TABS.osd? In this way we don't duplicate here the variable. I did a little test yesterday but it not worked, but maybe I did something wrong.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good shout. Will grab a look

Copy link
Member

Choose a reason for hiding this comment

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

Can we use export / import?

Copy link
Member Author

Choose a reason for hiding this comment

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

Eventually we can, but would need move virtual fc to modules first. But at the moment I'm trying to do similar thing to GUI first.

@blckmn
Copy link
Member

blckmn commented Sep 21, 2022 •
edited
Loading

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 -> FAIL
  • assigned to an approver -> PASS
  • approver count at least three -> FAIL

@haslinghuis haslinghuis added this to the 10.9.0 milestone Sep 25, 2022
@haslinghuis haslinghuis merged commit 4b20d5b into betaflight:master Sep 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@McGiverGim McGiverGim McGiverGim left review comments

@limonspb limonspb limonspb approved these changes

@haslinghuis haslinghuis haslinghuis approved these changes

@asizon asizon asizon approved these changes

Assignees

@chmelevskij chmelevskij

Labels
RN: BUGFIX
Projects
None yet
Milestone
10.9.0
Development

Successfully merging this pull request may close these issues.

OSD broken in Virtual FC since moved to modules
6 participants
@chmelevskij @blckmn @McGiverGim @limonspb @haslinghuis @asizon