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

Pan Enhancements and cardinal markers for ESP32 Radar #8699

Conversation

MrD-RC
Copy link
Collaborator

@MrD-RC MrD-RC commented Jan 13, 2023

This PR improves the use of pan servos in INAV. Plus adds enhancements to ESP32 Radar, making it easier to find other pilots.

Since INAV 3.0, we have been able to configure the pan servo, so that the home direction will change based on the direction you are facing. However, setting this up was only in CLI, so many people didn't realise that it existed. This PR brings the configuration in to the OSD page of the Configurator, making setup much simpler. There are also additional OSD elements which can show the direction the pan servo has moved and, optionally, how many degrees. A warning can also be set for close to centre, but not centred. Also, this moving of elements based on pan direction has been extended from only the home position to the elements of the HUD.

image

The enhancements to ESP32 Radar include replacing the multi arrow direction to the other plane arrow with cardinal indicators. The multi arrows from each side of the HUD element were confusing and not easy to use. The cardinal indicators are much clearer at showing the direction to the other plane. The altitude difference and distance to the other craft have been extended by one digit. For example, altitude difference is now capped at 999, compared to 99.

Before
image

After
image

Ideally, these two things would have been developed separately. But, they complimented each other, and the development of the pan enhancements progressed because of that.

Testing required

This PR is pretty much there. I just need to verify that when panning, the OSD elements move the correct way. Initially not having a P&T model, and then video issues, bad weather, and development that took priority has scuppered my plans to test this last piece. Hopefully I can in the next 2 weeks. If not, it will just have to get bumped in to the next version.

Requires configurator iNavFlight/inav-configurator#1691

@rts18
Copy link

rts18 commented Jan 15, 2023

@MrD-RC I found those three arrows hard to correlate to the craft position. This will be a good improvment.

@MrD-RC
Copy link
Collaborator Author

MrD-RC commented Jan 20, 2023

Windows builds of the associated Configurator can be found here.

@MrD-RC MrD-RC added this to the 6.0 milestone Jan 29, 2023
The 1-3 arrows that hang off the side of the ESP32 Radar POIs are not intuitive for finding your flying buddies. This PR replaces the 1-3 arrows with a compass style cardinal indicator. This will point in the direction of the other craft. It is displayed on the right of the POI, to be distinct from the relative heading arrow.
- Renamed `osdPanServoHomeDirectionOffset` to `osdGetPanServoOffset` as the function does not reference home direction. So it can be used elsewhere.
- Added pan servo offset to POIs.
- Made cardinal always visible for ESP32 Radar.
Updated the `osd_pan_servo_index` max to 16. There are flight controllers now that have 12 PWM outputs. This now matches `MAX_SUPPORTED_SERVOS`.
- Fix bug from merge with master
- Reverse pan offset direction arrow
@MrD-RC MrD-RC force-pushed the MrD_ESP32-Radar-use-cardinal-markers,-plus-pan-enhancements branch from 2084948 to 3b13709 Compare January 29, 2023 20:32
@MrD-RC MrD-RC modified the milestones: 6.0, 6.0 RC2 Jan 29, 2023
@MrD-RC MrD-RC changed the base branch from master to release_6.0.0 January 29, 2023 20:34
@DzikuVx DzikuVx modified the milestones: 6.0 RC2, 6.0 Jan 30, 2023
@MrD-RC MrD-RC merged commit 1a75f11 into release_6.0.0 Feb 5, 2023
@MrD-RC MrD-RC deleted the MrD_ESP32-Radar-use-cardinal-markers,-plus-pan-enhancements branch February 5, 2023 18:23
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.

3 participants