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

Adding Configurator support for new OSD feature Camera Angle Reference #3570

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

MedlinDrone
Copy link

@MedlinDrone MedlinDrone commented Sep 7, 2023

Camera Angle Reference OSD Feature

Requires: betaflight/betaflight#13070

This is my first pull request so be gentle. Will be submitting the Betaflight pull request directly after submitting configurator and will reference this pull request in the other.

This is an OSD visual reference for current camera angle intended to be used with a single axis tilt gimbal, like those shown on medlindrone.com

This is currently configured via CLI, will add a GUI for it in the future.

There are five new cli parameters:
-osd_car_pos (osd element position)
-osd_car_channel (channel controlling the gimbal/apl)
-osd_car_scale (scale for adjusting vertical scale / sensitivity)
-osd_car_width (width for adjusting witdh between dots)
-osd_car_dots (number of dots on each side)

Discussion betaflight/betaflight#12438

@sonarcloud
Copy link

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

@MedlinDrone
Copy link
Author

IMG_6179.mov

@github-actions

This comment has been minimized.

@blckmn
Copy link
Member

blckmn commented Sep 7, 2023

AUTOMERGE: (FAIL)

  • github identifies PR as mergeable -> FAIL
  • assigned to a milestone -> FAIL
  • 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

@MedlinDrone
Copy link
Author

Depends on betaflight/betaflight#13070

@ctzsnooze
Copy link
Member

What's the difference between this new 'artificial horizon' type indicator, and the old one?

@nerdCopter
Copy link
Member

What's the difference between this new 'artificial horizon' type indicator, and the old one?

i believe it refers to camera tilt/angle of a single axis tilt gimbal.

@HThuren
Copy link
Member

HThuren commented Sep 17, 2023

@MedlinDrone, you don't have to change language other than en since Crowin will add to the other languages.

@MedlinDrone
Copy link
Author

What's the difference between this new 'artificial horizon' type indicator, and the old one?

@ctzsnooze what @nerdCopter is correct, when flying with a single-axis tilt gimbal (like those on medlindrone.com) this shows you an artificial propeller line/cockpit so that you know what camera angle you are at.

@MedlinDrone
Copy link
Author

@MedlinDrone, you don't have to change language other than en since Crowin will add to the other languages.

@HThuren Thanks for letting me know, I added the entries into the various messages files in English just to make sure it didn't break anything, is that the correct way to do it or should I not touch the other languages message files?

@HThuren
Copy link
Member

HThuren commented Sep 17, 2023

@MedlinDrone, you don't have to change language other than en since Crowin will add to the other languages.

@HThuren Thanks for letting me know, I added the entries into the various messages files in English just to make sure it didn't break anything, is that the correct way to do it or should I not touch the other languages message files?

Hi @MedlinDrone, no, you just add to the en file, Crowdin do the rest.

@HThuren
Copy link
Member

HThuren commented Oct 10, 2023

@MedlinDrone you can cover up by doing a "git restore xx" where xx are full path to the language files other than "en"

@MedlinDrone MedlinDrone force-pushed the New-OSD-Feature-Camera-Angle-Reference branch 2 times, most recently from 34a4264 to 6fe7b76 Compare October 24, 2023 02:13
@MedlinDrone
Copy link
Author

@HThuren I updated the pull request, now it only includes the English messages file

@MedlinDrone
Copy link
Author

CAR 'Camera Angle Reference' CLI Values.

-CAR Channel controlling servo/gimbal
osd_car_channel = 7
Allowed range: 1 - 18
Default value: 7

-CAR Scale for adjusting vertical scale / sesitivity
osd_car_scale = 13
Allowed range: -22 - 22
Default value: 13

-CAR Dots for adjusting number of dots on each side
osd_car_dots = 3
Allowed range: 1 - 20
Default value: 7

-CAR Width for adjusting witdh between dots
osd_car_width = 16
Allowed range: 5 - 46
Default value: 18

CAR Sidebar Values.

-CAR Sidebar Scale for adjusting vertical scale
osd_car_sbar_scale = 2
Allowed range: 1 - 4
Default value: 2

-CAR Sidebar angle 1/5
osd_car_sbar_low = 30
Allowed range: -99 - 99
Default value: 30

-CAR Sidebar angle 2/5
osd_car_sbar_mid_low = 15
Allowed range: -99 - 99
Default value: 15

-CAR Sidebar angle 3/5
osd_car_sbar_mid = 0
Allowed range: -99 - 99
Default value: 0

-CAR Sidebar angle 4/5
osd_car_sbar_mid_high = 15
Allowed range: -99 - 99
Default value: 15

-CAR Sidebar angle 5/5
osd_car_sbar_high = 30
Allowed range: -99 - 99
Default value: 30

@github-actions

This comment has been minimized.

@MedlinDrone
Copy link
Author

SidebarClipLowRes.mp4

This is an OSD visual reference for current camera angle (open to name changes) intended to be used with a single axis tilt gimbal, like those shown on medlindrone.com

For 'Camera Angle Reference' there are five new cli parameters:
-osd_car_pos (osd element position)
-osd_car_channel (channel controlling the gimbal/car)
-osd_car_scale (scale for adjusting vertical scale/sensitivity)
-osd_car_width (width for adjusting witdh between dots)
-osd_car_dots (number of dots on each side)

For 'Camera Angle Reference Sidebar' there are seven new cli parameters:
-osd_car_sbar_pos; (osd element position)
-osd_car_sbar_scale; (scale for adjusting vertical scale)
-osd_car_sbar_low; (angle 1/5)
-osd_car_sbar_mid_low; (angle 2/5)
-osd_car_sbar_mid; (angle 3/5)
-osd_car_sbar_mid_high; (angle 4/5)
-osd_car_sbar_high; (angle 5/5)

Added UI in OSD tab to changes CLI values, "Camera Angle Reference' section on right side
@MedlinDrone MedlinDrone force-pushed the New-OSD-Feature-Camera-Angle-Reference branch from 72c2e99 to 9d8cbea Compare November 13, 2023 15:25
Copy link

sonarcloud bot commented Nov 13, 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

Copy link
Contributor

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs within a week.

Copy link
Contributor

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs within a week.

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

Successfully merging this pull request may close these issues.

6 participants