Merge remote-tracking branch 'upstream/master' into abo_fixed_wing_soaring_mode
commitaa1f6c2be777cb900f0c0ed6fa421bf7da66613f
authorbreadoven <56191411+breadoven@users.noreply.github.com>
Sun, 7 Nov 2021 15:51:49 +0000 (7 15:51 +0000)
committerbreadoven <56191411+breadoven@users.noreply.github.com>
Sun, 7 Nov 2021 15:51:49 +0000 (7 15:51 +0000)
tree92e948cc3d2633c820d4ffb66dd5c692b1a9b048
parent9ce4e2758f82d05ff9248fe95acaafd3c8045ab2
parent264955ba939bf10a38975d5536a277734a36c6e6
Merge remote-tracking branch 'upstream/master' into abo_fixed_wing_soaring_mode
docs/Settings.md
src/main/fc/settings.yaml
src/main/io/osd.c
src/main/io/osd.h
src/main/navigation/navigation.c
src/main/navigation/navigation.h