Merge branch 'master' into MrD_Enhance-mAh-remaining-OSD-Element
commitd4f54888c9cef580b942e55e1ff0a68f1a0e1808
authorDarren Lines <darren@darrenlines.uk>
Sun, 1 Oct 2023 08:52:57 +0000 (1 09:52 +0100)
committerDarren Lines <darren@darrenlines.uk>
Sun, 1 Oct 2023 08:52:57 +0000 (1 09:52 +0100)
tree72e099b24a0c6df25284736f78c8dc4b980ba966
parentb90de1571e4b6c96f08de5a89c23d069f622a2b3
parentd04536a11da6564fb06fa1f118a4ff9368da33a1
Merge branch 'master' into MrD_Enhance-mAh-remaining-OSD-Element
docs/Settings.md
src/main/fc/settings.yaml
src/main/io/osd.c
src/main/io/osd.h