Merge remote-tracking branch 'upstream/master' into abo_add_osd_symbols

2025-07-24 08:45:26 +03:00 · 2022-12-06 23:22:36 +00:00 · 2022-12-06 23:22:36 +00:00 · 1cb651ebb1
commit 1cb651ebb1
parent ade4a25f8c 6885c58d8f
40 changed files with 7169 additions and 7169 deletions
--- a/resources/osd/analogue/bold.mcm
+++ b/resources/osd/analogue/bold.mcm
--- a/resources/osd/analogue/bold.png
+++ b/resources/osd/analogue/bold.png
--- a/resources/osd/analogue/bold/257_280.png
+++ b/resources/osd/analogue/bold/257_280.png
--- a/resources/osd/analogue/bold/257_296.png
+++ b/resources/osd/analogue/bold/257_296.png
--- a/resources/osd/analogue/clarity.mcm
+++ b/resources/osd/analogue/clarity.mcm
--- a/resources/osd/analogue/clarity.png
+++ b/resources/osd/analogue/clarity.png
--- a/resources/osd/analogue/clarity/257_280.png
+++ b/resources/osd/analogue/clarity/257_280.png
--- a/resources/osd/analogue/clarity/257_296.png
+++ b/resources/osd/analogue/clarity/257_296.png
--- a/resources/osd/analogue/clarity_medium.mcm
+++ b/resources/osd/analogue/clarity_medium.mcm
--- a/resources/osd/analogue/clarity_medium.png
+++ b/resources/osd/analogue/clarity_medium.png
--- a/resources/osd/analogue/clarity_medium/257_280.png
+++ b/resources/osd/analogue/clarity_medium/257_280.png
--- a/resources/osd/analogue/clarity_medium/257_296.png
+++ b/resources/osd/analogue/clarity_medium/257_296.png
--- a/resources/osd/analogue/default.mcm
+++ b/resources/osd/analogue/default.mcm
--- a/resources/osd/analogue/default.png
+++ b/resources/osd/analogue/default.png
--- a/resources/osd/analogue/default/257_280.png
+++ b/resources/osd/analogue/default/257_280.png
--- a/resources/osd/analogue/default/257_296.png
+++ b/resources/osd/analogue/default/257_296.png
--- a/resources/osd/analogue/iNav
+++ b/resources/osd/analogue/iNav
@ -144,7 +144,7 @@ SYM_CROSS_TRACK_ERROR      | SYM.CROSS_TRACK_ERROR        | Cross track error
 SYM_ADSB                   | SYM.ADSB                     | ADSB                                  | 253        | 0xFD
 SYM_BLACKBOX               | SYM.BLACKBOX                 | Blackbox                              | 254        | 0xFE
 | | | |
-SYM_LOGO_START             |                              | INAV Logo                             | 257 - 280  | 0x101 - 0x118
+SYM_LOGO_START             |                              | INAV Logo                             | 257 - 296  | 0x101 - 0x128
 SYM_AH_LEFT                | SYM.AH_LEFT                  | AHI Arrow left                        | 300        | 0x12C
 SYM_AH_RIGHT               | SYM.AH_RIGHT                 | AHI Arrow right                       | 301        | 0x12D
 SYM_AH_DECORATION_MIN      |                              | AHI Scrolling graphics                | 302 - 307  | 0x12E - 0x133
--- a/resources/osd/analogue/impact.mcm
+++ b/resources/osd/analogue/impact.mcm
--- a/resources/osd/analogue/impact.png
+++ b/resources/osd/analogue/impact.png
--- a/resources/osd/analogue/impact/257_280.png
+++ b/resources/osd/analogue/impact/257_280.png
--- a/resources/osd/analogue/impact/257_296.png
+++ b/resources/osd/analogue/impact/257_296.png
--- a/resources/osd/analogue/impact_mini.mcm
+++ b/resources/osd/analogue/impact_mini.mcm
--- a/resources/osd/analogue/impact_mini.png
+++ b/resources/osd/analogue/impact_mini.png
--- a/resources/osd/analogue/impact_mini/257_280.png
+++ b/resources/osd/analogue/impact_mini/257_280.png
--- a/resources/osd/analogue/impact_mini/257_296.png
+++ b/resources/osd/analogue/impact_mini/257_296.png
--- a/resources/osd/analogue/large.mcm
+++ b/resources/osd/analogue/large.mcm
--- a/resources/osd/analogue/large.png
+++ b/resources/osd/analogue/large.png
--- a/resources/osd/analogue/large/257_280.png
+++ b/resources/osd/analogue/large/257_280.png
--- a/resources/osd/analogue/large/257_296.png
+++ b/resources/osd/analogue/large/257_296.png
--- a/resources/osd/analogue/vision.mcm
+++ b/resources/osd/analogue/vision.mcm
--- a/resources/osd/analogue/vision.png
+++ b/resources/osd/analogue/vision.png
--- a/resources/osd/analogue/vision/257_280.png
+++ b/resources/osd/analogue/vision/257_280.png
--- a/resources/osd/analogue/vision/257_296.png
+++ b/resources/osd/analogue/vision/257_296.png
--- a/resources/osd/avatar/default/12x18/257_280.png
+++ b/resources/osd/avatar/default/12x18/257_280.png
--- a/resources/osd/avatar/default/12x18/257_296.png
+++ b/resources/osd/avatar/default/12x18/257_296.png
--- a/resources/osd/avatar/default/24x36/257_280.png
+++ b/resources/osd/avatar/default/24x36/257_280.png
--- a/resources/osd/avatar/default/24x36/257_296.png
+++ b/resources/osd/avatar/default/24x36/257_296.png
--- a/resources/osd/avatar/default/36x54/252.png
+++ b/resources/osd/avatar/default/36x54/252.png
--- a/resources/osd/avatar/default/36x54/257_280.png
+++ b/resources/osd/avatar/default/36x54/257_280.png
--- a/resources/osd/avatar/default/36x54/257_296.png
+++ b/resources/osd/avatar/default/36x54/257_296.png