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

Merge current release 6.1.0 from iNavFlight/inav-configurator #3

Merged
merged 417 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
417 commits
Select commit Hold shift + click to select a range
8d9774b
Merge pull request #1 from b14ckyy/preset-6.0-update
b14ckyy Oct 19, 2022
eb3abdb
Update defaults_dialog.js
b14ckyy Oct 19, 2022
af393fd
Merge pull request #1641 from b14ckyy/master
DzikuVx Oct 19, 2022
dc59dcb
Fix build
DzikuVx Oct 22, 2022
3e6dd45
Drop IMU2 function
DzikuVx Oct 23, 2022
a541c13
Added Path Tracking Settings
b14ckyy Oct 23, 2022
c22f39b
added FS Mission Delay to GUI (still needs a warning popup for disabl…
b14ckyy Oct 23, 2022
6f4c591
fixed unit
b14ckyy Oct 23, 2022
566b25d
added Dead Reckoning Feature but commented out for now as it is not p…
b14ckyy Oct 23, 2022
1cd591c
Adding more Nav settings
b14ckyy Oct 23, 2022
d0add78
Added a few more settings
b14ckyy Oct 23, 2022
0d579cc
fix trackback setting
b14ckyy Oct 23, 2022
f346112
Merge pull request #1642 from iNavFlight/dzikuvx-drop-imu2
DzikuVx Oct 23, 2022
d998d48
Rearranged a few settings for consistency
b14ckyy Oct 23, 2022
3557cd1
Changed Trackback description
b14ckyy Oct 25, 2022
a17113a
fixed error in descr of wp tracking angle
b14ckyy Oct 29, 2022
0fdf9d2
Fix issue with older firmware
MrD-RC Oct 29, 2022
1a33ca1
Merge pull request #1645 from iNavFlight/MrD_Fix-auto-target-detect-o…
DzikuVx Oct 30, 2022
126d381
Merge branch 'iNavFlight:master' into add-new-settings
b14ckyy Nov 1, 2022
671b2fe
Initial changes to enable new strobe functionality
mmosca Nov 9, 2022
2c54501
Switch to new LED_STRIP_CONFIG_EX functions
mmosca Nov 9, 2022
ba74db2
Successfully edited and saved strobe overlay
mmosca Nov 9, 2022
6e1973a
Change messages to MSP2_INAV range
mmosca Nov 10, 2022
a04fdee
Update README.md
xsnoopy Nov 13, 2022
8a54665
Merge pull request #1648 from xsnoopy/patch-1
DzikuVx Nov 14, 2022
33764ab
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Nov 14, 2022
e7ed9ce
Merge pull request #1621 from iNavFlight/MrD_Changes-for-PR-8401
MrD-RC Nov 15, 2022
1bd4691
Improve non-metric handling
MrD-RC Nov 16, 2022
6e8516f
Change reset acc calibration button
MrD-RC Nov 16, 2022
5ffea38
Lightened text colour
MrD-RC Nov 16, 2022
c28aa86
Merge pull request #1650 from iNavFlight/MrD_Change-reset-acc-button
MrD-RC Nov 16, 2022
e567dce
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Nov 16, 2022
9a0967e
Initial coding
MrD-RC Nov 19, 2022
cdcf693
Added new Waypoints operand group
MrD-RC Nov 23, 2022
6eafe7a
Changed text for operand
MrD-RC Nov 24, 2022
1587253
Update fc.js
MrD-RC Nov 24, 2022
173526e
Update logo graphics for new size
MrD-RC Nov 26, 2022
02eabb5
Update iNav character map.md
MrD-RC Nov 26, 2022
211f184
Change compass calibration message.
MrD-RC Nov 26, 2022
c071572
Merge pull request #1655 from iNavFlight/MrD_Update-compass-caibratio…
MrD-RC Nov 26, 2022
ca59ec3
Add correct symbols for remaining time and distance
MrD-RC Nov 26, 2022
cbc6608
Updated analogue symbol concept to match digital
MrD-RC Nov 26, 2022
abf47a3
Changes for https://github.com/iNavFlight/inav/pull/8589
MrD-RC Nov 27, 2022
427b9c6
Renamed parameter
MrD-RC Nov 27, 2022
912438b
Merge pull request #1636 from iNavFlight/MrD_Remove-unnecesary-parame…
MrD-RC Nov 27, 2022
52d546c
Merge pull request #1659 from iNavFlight/MrD_Increase-nav_wp_safe_dis…
MrD-RC Nov 27, 2022
492f71e
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Nov 29, 2022
9c659aa
Added missing icons
MrD-RC Nov 29, 2022
a38c96f
Added more LCs
MrD-RC Dec 1, 2022
0bb96b9
Update fc.js
MrD-RC Dec 2, 2022
56cd9f0
Merge pull request #1653 from iNavFlight/MrD_Add-EDGE-LC-switch
MrD-RC Dec 3, 2022
fcc2406
Merge pull request #1656 from iNavFlight/MrD_Add-symbols-for-remainin…
MrD-RC Dec 4, 2022
9982270
Merge pull request #1649 from iNavFlight/MrD_Units-conversion-force-m…
MrD-RC Dec 4, 2022
387325a
add osd symbols
breadoven Dec 4, 2022
1716bbf
update md + change symbol
breadoven Dec 5, 2022
43284ab
Merge pull request #1643 from b14ckyy/add-new-settings
MrD-RC Dec 5, 2022
1d53949
Merge branch 'master' into MrD_Change-logo-size-for-future-enhancements
MrD-RC Dec 6, 2022
c016e20
Update from master
MrD-RC Dec 6, 2022
5c88655
Merge pull request #1657 from iNavFlight/MrD_Change-logo-size-for-fut…
MrD-RC Dec 6, 2022
3118d79
Update 252.png
MrD-RC Dec 6, 2022
6885c58
Merge pull request #1662 from iNavFlight/MrD_Remove-white-background-…
MrD-RC Dec 6, 2022
ade4a25
Merge remote-tracking branch 'upstream/master' into abo_add_osd_symbols
breadoven Dec 6, 2022
1cb651e
Merge remote-tracking branch 'upstream/master' into abo_add_osd_symbols
breadoven Dec 6, 2022
685e040
resolve conflicts
breadoven Dec 6, 2022
aebe790
Merge pull request #1660 from breadoven/abo_add_osd_symbols
breadoven Dec 6, 2022
6742dba
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Dec 7, 2022
5e039ec
Fix calibration button
MrD-RC Dec 7, 2022
131250a
Added course over ground symbols for Avatar
MrD-RC Dec 8, 2022
858c0af
Merge pull request #1664 from iNavFlight/MrD_Fix-calibrate-accelerome…
MrD-RC Dec 8, 2022
242d356
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Dec 8, 2022
34c59b5
Fix staged rth altitude parameter
b14ckyy Dec 9, 2022
0453258
Merge pull request #1668 from b14ckyy/fix-rth-settings
MrD-RC Dec 9, 2022
534490b
Update Avatar size
MrD-RC Dec 9, 2022
82fa1d4
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Dec 10, 2022
fcc8d89
Add BF43COMPAT to configurator
mmosca Dec 12, 2022
c2eb99c
Update osd.js
mmosca Dec 14, 2022
1da406f
Merge pull request #1671 from mmosca/bf_osd_compat
DzikuVx Dec 16, 2022
83dfbd3
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Dec 16, 2022
5a7b20d
armingFlags on status line
rmawatson Dec 19, 2022
435278f
Add ability to check action on next WP
MrD-RC Dec 19, 2022
f6080ff
Merge branch 'master' into MrD_update-MSPDisplayPort-and-add-Avatar-s…
MrD-RC Dec 22, 2022
0639684
Reorganise osd folder
MrD-RC Dec 22, 2022
6497269
Merge pull request #1666 from iNavFlight/MrD_Add-HD-symbols-for-cours…
MrD-RC Dec 22, 2022
b6f0959
Merge branch 'master' into Mr_D-Reorganise-HD-fonts
MrD-RC Dec 22, 2022
b9194b6
Merge pull request #1674 from iNavFlight/Mr_D-Reorganise-HD-fonts
MrD-RC Dec 22, 2022
2026b8b
Enhance INAV Character Map document
MrD-RC Dec 23, 2022
f5375fa
Complete table for images to work
MrD-RC Dec 23, 2022
a300b93
Updated
MrD-RC Dec 23, 2022
0a89dfa
Add previews for characters with no variables
MrD-RC Dec 23, 2022
5144db6
Add missing symbols and use larger icons
MrD-RC Dec 23, 2022
3843582
Merge pull request #1675 from iNavFlight/MrD-Enhance-Character-Map-do…
MrD-RC Dec 23, 2022
e682a6d
Update README.md
MrD-RC Dec 24, 2022
64936f6
Merge pull request #1676 from iNavFlight/MrD_Update-readme-with-font-…
MrD-RC Dec 24, 2022
e8f4b72
Update README.md
MrD-RC Dec 24, 2022
dc17243
Merge pull request #1677 from iNavFlight/MrD_Tidy-URL-for-font-tool
MrD-RC Dec 24, 2022
f0c5938
Allow default baud rates on ports page
MrD-RC Dec 25, 2022
47fb763
Corrected text for quad motor reversal
MrD-RC Dec 27, 2022
d23638c
Merge pull request #1679 from iNavFlight/MrD_Correct-text-for-props-i…
DzikuVx Dec 27, 2022
d67cd8c
- Added a dedicated button for 'diff all'.
M0j0Risin Dec 28, 2022
e2bf207
Removed unnecessary justify-content style parameter.
M0j0Risin Dec 28, 2022
14a985d
A couple more adjustments to title casing for buttons
M0j0Risin Dec 28, 2022
1557bc7
Visual improvements
MrD-RC Dec 29, 2022
ea230ea
Added previews for Avatar Goggle OSD elements
MrD-RC Jan 2, 2023
9709b58
Merge branch 'master' into MrD_Enhance-programming-options-for-waypoi…
MrD-RC Jan 3, 2023
00558d6
Added bars for 4:3 ratio
MrD-RC Jan 5, 2023
a47d971
Make links to documents relevant to firmware version
MrD-RC Jan 9, 2023
388f003
Add note on Firmware Flasher for version matching
MrD-RC Jan 9, 2023
abc6810
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Jan 10, 2023
5735d8b
Merge pull request #1686 from iNavFlight/MrD_Add-note-to-firmware-fla…
MrD-RC Jan 10, 2023
008ad0c
Merge pull request #1685 from iNavFlight/MrD_Improve-links-to-CLI-doc…
MrD-RC Jan 10, 2023
dc8777c
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Jan 11, 2023
a756f98
OSD: Add missing alarms, and set visibility on availability
MrD-RC Jan 12, 2023
ede1be1
Merge pull request #1652 from iNavFlight/MrD_Enhance-programming-opti…
DzikuVx Jan 13, 2023
aec6427
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Jan 13, 2023
96459c5
Adjusted 4:3 preview
MrD-RC Jan 14, 2023
6bc27d2
Merge pull request #1683 from iNavFlight/MrD_update-MSPDisplayPort-an…
MrD-RC Jan 14, 2023
871d4c2
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Jan 14, 2023
11b59ff
Add BFHDCOMPAT
mmosca Jan 15, 2023
5388a12
Add ordering to Serial Rx Providers
MrD-RC Jan 17, 2023
9b8e9dd
Add user actions to Mission Control
MrD-RC Jan 17, 2023
1eb76e0
Merge pull request #1697 from iNavFlight/MrD_Add-user-actions-to-Miss…
MrD-RC Jan 18, 2023
28880ec
Add AUTO detect to modes page
MrD-RC Jan 18, 2023
5b73309
Merge branch 'iNavFlight:master' into strobe-configurator
mmosca Jan 18, 2023
f2ca13e
Merge branch 'iNavFlight:master' into bfhd
mmosca Jan 18, 2023
71d22e5
Merge pull request #1699 from iNavFlight/MrD_Add-auto-selection-of-rc…
DzikuVx Jan 19, 2023
2af2fd2
Add pilot name
MrD-RC Jan 19, 2023
46e4497
Correction once I could use the firmware
MrD-RC Jan 19, 2023
a849388
Merge pull request #1647 from mmosca/strobe-configurator
DzikuVx Jan 20, 2023
5a6c2d7
Merge pull request #1701 from iNavFlight/MrD_Add-pilot-name
MrD-RC Jan 20, 2023
2b5c725
Merge branch 'iNavFlight:master' into bfhd
mmosca Jan 23, 2023
df88f1d
Add acro and mission to Flight modes operand
MrD-RC Jan 28, 2023
ce4906f
Merge pull request #1705 from iNavFlight/MrD_Add-acro-and-mission-to-…
DzikuVx Jan 29, 2023
b808e49
ESP32 Radar: Use cardinal markers, plus pan enhancements
MrD-RC Dec 24, 2022
6fd5f53
Corrected id of pan servo element
MrD-RC Jan 29, 2023
a5d84c6
Merge branch 'release_6.0.0' into MrD_Add-alarms-for-airspeed
MrD-RC Jan 29, 2023
cf35bd6
AT32 MCU DFU added
Feb 2, 2023
bcadfbb
Create 3" defaults profile
DzikuVx Feb 3, 2023
1f83649
Enable Dynamic LPF on 5" preset
DzikuVx Feb 3, 2023
7cd8ca3
Allow to change dynamic gyro filter settings from PID Tuning tab
DzikuVx Feb 3, 2023
6268882
Split to separate subsection
DzikuVx Feb 3, 2023
c4cdcef
Merge pull request #1678 from iNavFlight/MrD_Use-default-baud-rate-wh…
DzikuVx Feb 3, 2023
ca8ed9c
Merge pull request #1689 from iNavFlight/MrD_Add-alarms-for-airspeed
DzikuVx Feb 3, 2023
320958c
Small update
DzikuVx Feb 3, 2023
cf1ebb4
Merge pull request #1708 from iNavFlight/dzikuvx-default-updates
DzikuVx Feb 3, 2023
6d266c2
Merge pull request #1709 from iNavFlight/dzikuvx-dyn-gyro-lpf
DzikuVx Feb 3, 2023
c0cc8cb
Merge pull request #1696 from iNavFlight/MrD_Add-ordering-to-Serial-R…
MrD-RC Feb 3, 2023
15238ff
Merge pull request #1691 from iNavFlight/MrD_ESP32-Radar-use-cardinal…
MrD-RC Feb 5, 2023
a4b3ebe
Bump min version to 6.0.0
DzikuVx Feb 7, 2023
6d0e885
Merge pull request #1715 from iNavFlight/dzikuvx-bump-min-version
DzikuVx Feb 7, 2023
429275d
Merge branch 'iNavFlight:master' into bfhd
mmosca Feb 8, 2023
0dfb2ce
Make pan servo selection more intuitive
MrD-RC Feb 10, 2023
cc6a7df
Merge pull request #1718 from iNavFlight/MrD_Make-pan-servo-select-on…
MrD-RC Feb 11, 2023
7bdedf2
Update defaults_dialog.js
MrD-RC Feb 13, 2023
c352efd
Merge pull request #1720 from iNavFlight/MrD_Update-defaults-for-new-…
MrD-RC Feb 13, 2023
beaddec
Bug fixes related to P3 field
MrD-RC Feb 14, 2023
cb7670f
Update waypointCollection.js
MrD-RC Feb 14, 2023
bda84ac
Update mission_control.js
MrD-RC Feb 14, 2023
67dc427
Update mission_control.js
MrD-RC Feb 15, 2023
f753b42
Merge branch 'MrD_Fix-alt-type-in-mission-planner' of https://github.…
MrD-RC Feb 15, 2023
199c61f
Update mission_control.js
MrD-RC Feb 15, 2023
4ede134
Update mission_control.js
MrD-RC Feb 15, 2023
feba353
Merge pull request #1722 from iNavFlight/MrD_Fix-alt-type-in-mission-…
MrD-RC Feb 15, 2023
655a7da
OSD Throttle update
MrD-RC Feb 17, 2023
33f8994
Enhance Linear Descent RTH feature
MrD-RC Feb 19, 2023
7a2ab07
Removed line of debug
MrD-RC Feb 21, 2023
3411777
Fixed mixer config issues
MrD-RC Feb 25, 2023
27e00d8
Merge pull request #1733 from iNavFlight/MrD_Fix-flaperon-mode-not-ap…
MrD-RC Feb 25, 2023
8b96de2
Fix led direction saving
mmosca Mar 1, 2023
4baf479
Merge pull request #1735 from mmosca/fix-led-config
mmosca Mar 2, 2023
069d0f2
SITL integration
Scavanger Mar 8, 2023
a8a437a
Merge pull request #1710 from iNavFlight/release_6.0.0
DzikuVx Mar 26, 2023
929d558
Version bump for 6.1.0 release
DzikuVx Mar 26, 2023
26d3d78
Merge pull request #1672 from rmawatson/armingFlags-on-status-line
DzikuVx Mar 26, 2023
c1a5b3c
Merge pull request #1707 from erstec/at32-implementation
DzikuVx Mar 26, 2023
448d9dc
Merge pull request #1738 from Scavanger/SITL-Integration
DzikuVx Mar 26, 2023
2fd2e62
Bump master to INAV 7
DzikuVx Mar 26, 2023
e290892
Merge branch 'master' into MrD_Enhance-RTH-Linear-Descent
MrD-RC Mar 27, 2023
f3c5824
Merge pull request #1743 from iNavFlight/dzikuvx-inav7-version-bump
DzikuVx Mar 28, 2023
6258ba8
Merge remote-tracking branch 'origin/release_6.1.0' into bfhd
mmosca Mar 29, 2023
33ac945
Fix preview size
mmosca Mar 29, 2023
c506707
Add reference bars
mmosca Mar 29, 2023
c9b3ff7
Adjust guidelines to match UI in Goggles V2
mmosca Mar 29, 2023
e0febae
remove classes that are not longer needed
mmosca Mar 29, 2023
d9c3933
tabs vs spaces
mmosca Mar 29, 2023
52082a3
tabs vs spaces
mmosca Mar 29, 2023
0f693c9
cleanup diff
mmosca Mar 29, 2023
22144bb
cleanup diff
mmosca Mar 29, 2023
0d5813e
Merge pull request #1747 from iNavFlight/bfhd
mmosca Mar 29, 2023
a43cecc
Preserve events on underlaying osd elements
mmosca Mar 30, 2023
07eee3c
Merge pull request #1750 from iNavFlight/mmosca-bfhdcompat-polish
mmosca Mar 30, 2023
0a25440
Rename AUTOLEVEL
MrD-RC Apr 11, 2023
e70b8fb
Add led_strip i18n
YI-BOYANG Apr 14, 2023
c9d0f5f
Add led_strip i18n
YI-BOYANG Apr 14, 2023
057e7f1
Add warning message to softserial ports
mmosca Apr 15, 2023
5ffccd1
Merge branch 'master' into MrD_Enhance-RTH-Linear-Descent
MrD-RC Apr 16, 2023
c1f8494
Merge pull request #1758 from iNavFlight/mmosca-softserialwarning
mmosca Apr 16, 2023
e5a8bd0
Small improvements
Scavanger Apr 17, 2023
9d254f1
Updated throttle indicator symbols
MrD-RC Apr 20, 2023
3118d9d
Merge pull request #1725 from iNavFlight/MrD_OSD-Throttle-Options
MrD-RC Apr 20, 2023
49e2457
Fix for 6.1
MrD-RC Apr 23, 2023
49ebef2
Merge pull request #1764 from iNavFlight/MrD_Fix-OSD-page-bug
MrD-RC Apr 23, 2023
d1fab85
Merge pull request #1727 from iNavFlight/MrD_Enhance-RTH-Linear-Descent
MrD-RC Apr 23, 2023
4ecf58a
Merge pull request #1761 from Scavanger/SITL-IMPROVEMENTS
DzikuVx Apr 24, 2023
f752856
Merge pull request #1755 from iNavFlight/MrD_Rename-AUTO-LEVEL
DzikuVx Apr 24, 2023
d689e3d
[SITl] Fix serial selection and executable name on Linux
stronnag Apr 24, 2023
340b6e4
update SITLs (and cygwin dll)
stronnag Apr 25, 2023
f7b40e8
update SITLs for firmware #9012
stronnag Apr 26, 2023
e397901
Merge pull request #1767 from stronnag/jh_SITLS_for_6.1.0
DzikuVx Apr 27, 2023
1697b15
Merge pull request #1681 from M0j0Risin/cli-usability-enhancements
DzikuVx Apr 27, 2023
ae0a662
Merge pull request #1756 from YI-BOYANG/master
DzikuVx May 1, 2023
f2ea173
[SITL] update SITLs for inav/#9029
stronnag May 3, 2023
20e9cff
[SITL] Windows: Sunday SITL seems to work
stronnag May 7, 2023
467f02b
[SITL] update images for firmware/#9043
stronnag May 8, 2023
a08920b
Merge pull request #1775 from stronnag/jh_SITLS_for_6.1.0
DzikuVx May 11, 2023
25a7308
Merge pull request #1766 from stronnag/jh_fix_linux_ser2tcp
DzikuVx May 11, 2023
daa2f47
Add the text from these files to i18n.
YI-BOYANG May 12, 2023
049ee01
Merge pull request #1778 from YI-BOYANG/master
DzikuVx May 13, 2023
b02fe89
Add the text from these files to i18n.
YI-BOYANG May 16, 2023
c45a14f
Added some i18n to strings for the GUI console.
YI-BOYANG May 16, 2023
8f13a77
Updating the messages file
YI-BOYANG May 16, 2023
0064edf
Merge pull request #1783 from YI-BOYANG/master
DzikuVx May 23, 2023
e2c3a44
Add toggles for other GNSS constelations
mmosca Jun 8, 2023
098f24c
Remove gzss option, as it should always be enabled
mmosca Jun 8, 2023
7fa0f7e
Merge branch 'master' into release_6.1.0
mmosca Jun 9, 2023
554b4ad
Merge pull request #1742 from iNavFlight/release_6.1.0
mmosca Jun 9, 2023
cb74789
Merge remote-tracking branch 'origin/master' into mosca-gps-glonaass
mmosca Jun 9, 2023
a5b82a7
Remove GZSS from locale messages
mmosca Jun 14, 2023
9b5e05a
Add 230400 baud rate to gps
mmosca Jun 15, 2023
ac5758a
[rpm-build] remove obsolete dependency
stronnag Jun 15, 2023
8c213fd
Merge pull request #1790 from stronnag/jh_fix_rpm_build
mmosca Jun 15, 2023
fd20fe1
Update messages.json
mmosca Jun 15, 2023
40f05ec
Update README.md
MrD-RC Jun 15, 2023
33d86a7
Update README.md
MrD-RC Jun 15, 2023
600c6d0
Update README.md
MrD-RC Jun 16, 2023
5041ae5
Merge pull request #1789 from iNavFlight/mosca-gps-glonaass
mmosca Jun 17, 2023
fc8741e
nw-builder 3.5.7->4.0.11
Jun 20, 2023
54cc7c4
clean up
Jun 21, 2023
1962218
Merge pull request #1793 from erstec/nw-builder_update
mmosca Jun 26, 2023
50a2ccf
fixed: magnetometer align tool does not take board orientation into a…
RomanLut Jun 30, 2023
4a6f22c
updated hint
RomanLut Jun 30, 2023
3fdcc93
Merge pull request #1799 from RomanLut/submit-fix-mag-tool
DzikuVx Jul 1, 2023
b1e5b3f
added compass direction arrow to magnetometer model
RomanLut Jul 4, 2023
ba566e4
Merge pull request #1800 from RomanLut/submit-compass-direction
DzikuVx Jul 4, 2023
c246749
implemented fc display in align helper
RomanLut Jul 4, 2023
187806c
Merge pull request #1801 from RomanLut/submit-fc-display
DzikuVx Jul 4, 2023
fada683
Merge pull request #1791 from iNavFlight/MrD_Update-linux-install-gui…
DzikuVx Jul 4, 2023
d314c74
Add radar elements to OSD tab
mmosca Jul 24, 2023
959da00
Add wp disp and move HUD settings to its own section
mmosca Jul 27, 2023
2fcbf93
Add fov settings and radar range
mmosca Jul 28, 2023
30ec477
Merge pull request #1808 from iNavFlight/mmosca-radar-settings
mmosca Jul 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add fov settings and radar range
  • Loading branch information
mmosca committed Jul 28, 2023
commit 2fcbf93753218c85bb0ffa6c08bdb66d58cfa9bd
30 changes: 30 additions & 0 deletions _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3431,12 +3431,42 @@
"osd_hud_radar_disp_help": {
"message": "This is used for INAV Radar/FormationFlight. 0 disables this feature."
},

"osd_hud_radar_range_min": {
"message": "Minimum radar range"
},
"osd_hud_radar_range_min_help": {
"message": "Radar aircrafts closer than this will not be displayed in the HUD."
},

"osd_hud_radar_range_max": {
"message": "Maximum radar range"
},
"osd_hud_radar_range_max_help": {
"message": "Radar aircrafts further away than this will not be displayed in the HUD."
},


"osd_hud_wp_disp": {
"message": "Maximum number of waypoint elements on screen."
},
"osd_hud_wp_disp_help": {
"message": "Number of Wayponts to show on screen. 0 disables this feature."
},
"osd_camera_fov_h": {
"message": "Camera Horizontal FOV"
},
"osd_camera_fov_h_help": {
"message": "Camera Horizontal Field of View in Degrees. It is used to calculate the position of elements in the HUD display."
},
"osd_camera_fov_v": {
"message": "Camera Vertical FOV"
},
"osd_camera_fov_v_help": {
"message": "Camera Vertical Field of View in Degrees. It is used to calculate the position of elements in the HUD display."
},


"osd_alarms": {
"message": "Alarms"
},
Expand Down
30 changes: 27 additions & 3 deletions tabs/osd.html
Original file line number Diff line number Diff line change
Expand Up @@ -353,16 +353,40 @@ <h1 class="tab_title" data-i18n="tabOSD"></h1>
<select class="update_preview" id="osd_horizon_offset" data-setting="osd_horizon_offset" data-setting-invert-select="true" data-live="true"></select>
<span data-i18n="osd_horizon_offset"></span>
</label>
<div for="osd_hud_wp_disp" class="helpicon cf_tip" data-i18n_title="osd_hud_wp_disp_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_hud_wp_disp" class="toggle update_preview" data-live="true">
<span data-i18n="osd_hud_wp_disp"></span>
</label>
<div for="osd_hud_radar_disp" class="helpicon cf_tip" data-i18n_title="osd_hud_radar_disp_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_hud_radar_disp" class="toggle update_preview" data-live="true">
<span data-i18n="osd_hud_radar_disp"></span>
</label>
<div for="osd_hud_wp_disp" class="helpicon cf_tip" data-i18n_title="osd_hud_wp_disp_help"></div>

<div for="osd_hud_radar_range_min" class="helpicon cf_tip" data-i18n_title="osd_hud_radar_range_min_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_hud_wp_disp" class="toggle update_preview" data-live="true">
<span data-i18n="osd_hud_wp_disp"></span>
<input type="number" data-step="1" data-unit="m" data-setting-multiplier="1" data-setting="osd_hud_radar_range_min" class="toggle update_preview" data-live="true">
<span data-i18n="osd_hud_radar_range_min"></span>
</label>
<div for="osd_hud_radar_range_max" class="helpicon cf_tip" data-i18n_title="osd_hud_radar_range_max_help"></div>
<label>
<input type="number" data-step="1" data-unit="m" data-setting-multiplier="1" data-setting="osd_hud_radar_range_max" class="toggle update_preview" data-live="true">
<span data-i18n="osd_hud_radar_range_max"></span>
</label>

<div for="osd_camera_fov_h" class="helpicon cf_tip" data-i18n_title="osd_camera_fov_h_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_camera_fov_h" class="toggle update_preview" data-live="true">
<span data-i18n="osd_camera_fov_h"></span>
</label>
<div for="osd_camera_fov_v" class="helpicon cf_tip" data-i18n_title="osd_camera_fov_v_help"></div>
<label>
<input type="number" data-step="1" data-setting-multiplier="1" data-setting="osd_camera_fov_v" class="toggle update_preview" data-live="true">
<span data-i18n="osd_camera_fov_v"></span>
</label>


</div>
</div>
</div>
Expand Down