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

vtx_osd_variant_fix #2964

Merged
merged 1 commit into from
Sep 17, 2022
Merged

Conversation

P-I-Engineer
Copy link
Contributor

this is a PR to replace #2755 i had too many github issues to salvage

I've created an osd variant for VTX channel that displays only the VTXpower.

pull request is partial approved in betaflight here
betaflight/betaflight#11275

image
image
image

src/js/tabs/osd.js Outdated Show resolved Hide resolved
src/js/tabs/osd.js Outdated Show resolved Hide resolved
@P-I-Engineer
Copy link
Contributor Author

i know this is messed up again, i'm having a heck of a time with squashing commits

haslinghuis
haslinghuis previously approved these changes Jun 28, 2022
@haslinghuis haslinghuis dismissed their stale review June 28, 2022 22:30

needs squash

@haslinghuis
Copy link
Member

@P-I-Engineer
Copy link
Contributor Author

i keep getting merge commits and not sure where they're coming from

@P-I-Engineer P-I-Engineer force-pushed the vtx_osd_variant_gitfix branch 2 times, most recently from f73c3b1 to 2670f64 Compare June 28, 2022 23:00
haslinghuis comment inc

comments inc

haslinghuis comment inc

Revert "haslinghuis comment inc"

This reverts commit cbe38ff.

Update src/js/tabs/osd.js

Co-authored-by: haslinghuis <[email protected]>

Update src/js/tabs/osd.js

Co-authored-by: haslinghuis <[email protected]>

clean

clean

fix

clean
@P-I-Engineer
Copy link
Contributor Author

got it

@sonarcloud
Copy link

sonarcloud bot commented Jun 28, 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

@haslinghuis haslinghuis added this to the 10.9.0 milestone Jun 29, 2022
@blckmn
Copy link
Member

blckmn commented Jun 29, 2022

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 -> FAIL
  • approver count at least three -> FAIL

@github-actions
Copy link
Contributor

github-actions bot commented Jul 5, 2022

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!

@blckmn blckmn merged commit c4706b1 into betaflight:master Sep 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants