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

Add aux value element #3057

Merged
merged 1 commit into from Oct 25, 2022
Merged

Add aux value element #3057

merged 1 commit into from Oct 25, 2022

Conversation

haslinghuis
Copy link
Member

Adds element from betaflight/betaflight#10789

@haslinghuis haslinghuis added this to the 10.9.0 milestone Oct 23, 2022
@haslinghuis haslinghuis self-assigned this Oct 23, 2022
@github-actions

This comment has been minimized.

@haslinghuis haslinghuis moved this from Firmware to Configurator in Finalizing Firmware 4.4 Release Oct 23, 2022
@@ -4980,6 +4980,14 @@
"osdDescElementWhDrawn": {
"message": "Total battery capacity used in Wh"
},
"osdDescElementAuxValue": {
"message": "Aux value",
"description": "Adds an element with receiver AUX channel value to 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 "Displays a receiver AUX channel see PR 10789"

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

ctzsnooze
ctzsnooze previously approved these changes Oct 23, 2022
@github-actions

This comment has been minimized.

@blckmn
Copy link
Member

blckmn commented Oct 23, 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 -> PASS
  • assigned to an approver -> PASS
  • approver count at least three -> FAIL

limonspb
limonspb previously approved these changes Oct 23, 2022
@haslinghuis
Copy link
Member Author

Rebased

@sonarcloud
Copy link

sonarcloud bot commented Oct 25, 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!

@blckmn blckmn merged commit f229c77 into betaflight:master Oct 25, 2022
Finalizing Firmware 4.4 Release automation moved this from Configurator to Closed Oct 25, 2022
@haslinghuis haslinghuis deleted the add-aux-value branch October 25, 2022 02:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

4 participants