Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/iNavFlight/inav-configurator.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-x_locales/en/messages.json12
-rw-r--r--resources/osd/bold.mcm136
-rw-r--r--resources/osd/bold/022.pngbin154 -> 173 bytes
-rw-r--r--resources/osd/bold/023.pngbin141 -> 179 bytes
-rw-r--r--resources/osd/clarity.mcm132
-rw-r--r--resources/osd/clarity/022.pngbin154 -> 172 bytes
-rw-r--r--resources/osd/clarity/023.pngbin141 -> 179 bytes
-rw-r--r--resources/osd/default.mcm104
-rw-r--r--resources/osd/default/022.pngbin167 -> 172 bytes
-rw-r--r--resources/osd/default/023.pngbin161 -> 179 bytes
-rw-r--r--resources/osd/large.mcm104
-rw-r--r--resources/osd/large/022.pngbin167 -> 172 bytes
-rw-r--r--resources/osd/large/023.pngbin161 -> 179 bytes
-rw-r--r--tabs/osd.js36
14 files changed, 285 insertions, 239 deletions
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 60eeb1ec..2f4dff21 100755
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -2432,6 +2432,18 @@
"osdElement_RADAR": {
"message": "Radar"
},
+ "osdElement_WIND_SPEED_HORIZONTAL": {
+ "message": "Horizontal Wind Speed"
+ },
+ "osdElement_WIND_SPEED_HORIZONTAL_HELP": {
+ "message": "Shows estimated horizontal wind speed and direction."
+ },
+ "osdElement_WIND_SPEED_VERTICAL": {
+ "message": "Vertical Wind Speed"
+ },
+ "osdElement_WIND_SPEED_VERTICAL_HELP": {
+ "message": "Shows estimated vertical wind speed and direction (up or down)."
+ },
"portColumnSensors": {
"message": "Sensors"
},
diff --git a/resources/osd/bold.mcm b/resources/osd/bold.mcm
index 4c949713..f69dfd9e 100644
--- a/resources/osd/bold.mcm
+++ b/resources/osd/bold.mcm
@@ -1407,58 +1407,59 @@ MAX7456
01010101
01010101
01010101
+01010110
+00000010
01010101
+01010110
+00000010
01010101
+01010110
+00100010
01010101
+01010110
+10001010
01010101
+01010110
+00000010
01010101
+01010100
+00000000
01010101
+01010110
+10000010
01010101
+01010110
+10100010
+01010101
+01010110
+00101010
01010101
+01010110
+00001010
+01010101
+01010110
+00000010
01010101
01010100
00000000
-00000000
-01010000
-00000000
-00000000
-01000010
-10101000
-10000000
-01000010
-00000000
-10100010
-01000010
-00000000
-10101010
-01000010
-00000000
-10001000
-01000010
-00101000
-10000000
-01000010
-00001000
-10000000
-01000010
-00001000
-10000000
-01000010
+01010101
+01010110
+10100000
+01010101
+01010110
00001000
-10000000
-01000010
-10101000
-10000000
-01010000
-00000000
-00000000
-01010100
-00000000
-00000000
01010101
+01010110
+00000010
01010101
+01010110
+00000010
01010101
+01010110
+00001000
01010101
+01010110
+10100000
01010101
01010101
01010101
@@ -1477,48 +1478,47 @@ MAX7456
01010101
01010101
01010101
+01010100
+00010101
+01010101
+01010010
+10000101
01010101
+01001000
+00100001
01010101
+00100001
+01001000
01010101
-00000000
-00000000
-00000101
-00000000
-00000000
-00000001
-10001010
-10000010
-00000000
-10001000
+00100001
+01001000
+01010001
+00100001
+00001000
+01001000
+00100000
+10000001
00100010
-00000000
-10001000
00100010
-00000000
-10001000
+00100001
00100010
-00000000
-10001010
-10000010
-00000000
-10001000
00100010
-00000000
-10001000
+00100001
00100010
-00000000
-10001000
00100010
-00000000
-10001010
-10000010
-10101000
-00000000
-00000000
-00000001
-00000000
-00000000
+00100001
+01000010
+00100010
00000101
+01010010
+00100010
+00010101
+01010010
+00100010
+00010101
+01010100
+00000000
+01010101
01010101
01010101
01010101
diff --git a/resources/osd/bold/022.png b/resources/osd/bold/022.png
index 7dbf1ddf..880cc66b 100644
--- a/resources/osd/bold/022.png
+++ b/resources/osd/bold/022.png
Binary files differ
diff --git a/resources/osd/bold/023.png b/resources/osd/bold/023.png
index 23b2c020..7728ae16 100644
--- a/resources/osd/bold/023.png
+++ b/resources/osd/bold/023.png
Binary files differ
diff --git a/resources/osd/clarity.mcm b/resources/osd/clarity.mcm
index 6d0c1df8..b984814c 100644
--- a/resources/osd/clarity.mcm
+++ b/resources/osd/clarity.mcm
@@ -1416,46 +1416,37 @@ MAX7456
01010101
01010101
01010101
-01010100
-00000000
-00000000
-01010000
-00000000
-00000000
-01000010
-10101000
-10000000
-01000010
-00000000
-10100010
-01000010
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010001
+01010101
+01010101
+01001000
00000000
-10101010
-01000010
+00000101
+00100010
+00101010
+10100001
+00100010
00000000
-10001000
-01000010
-00101000
-10000000
-01000010
-00001000
-10000000
-01000010
00001000
-10000000
-01000010
+00100010
+00010100
00001000
-10000000
-01000010
-10101000
-10000000
-01010000
-00000000
-00000000
-01010100
-00000000
+00100010
+00000010
+10100001
+00100010
+00101010
+00000101
+01001000
00000000
01010101
+01010001
01010101
01010101
01010101
@@ -1480,45 +1471,54 @@ MAX7456
01010101
01010101
01010101
-00000000
-00000000
-00000101
-00000000
-00000000
-00000001
-10001010
-10000010
-00000000
-10001000
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010101
+01010100
+00010101
+01010101
+01010010
+10000101
+01010101
+01001000
+00100001
+01010101
+00100001
+01001000
+01010101
+00100001
+01001000
+01010001
+00100001
+00001000
+01001000
+00100000
+10000001
00100010
-00000000
-10001000
00100010
-00000000
-10001000
+00100001
00100010
-00000000
-10001010
-10000010
-00000000
-10001000
00100010
-00000000
-10001000
+00100001
00100010
-00000000
-10001000
00100010
-00000000
-10001010
-10000010
-10101000
-00000000
-00000000
-00000001
-00000000
-00000000
+00100001
+01000010
+00100010
00000101
+01010010
+00100010
+00010101
+01010010
+00100010
+00010101
+01010100
+00000000
+01010101
01010101
01010101
01010101
diff --git a/resources/osd/clarity/022.png b/resources/osd/clarity/022.png
index 7dbf1ddf..7b3d90a3 100644
--- a/resources/osd/clarity/022.png
+++ b/resources/osd/clarity/022.png
Binary files differ
diff --git a/resources/osd/clarity/023.png b/resources/osd/clarity/023.png
index 23b2c020..7728ae16 100644
--- a/resources/osd/clarity/023.png
+++ b/resources/osd/clarity/023.png
Binary files differ
diff --git a/resources/osd/default.mcm b/resources/osd/default.mcm
index de195f78..f1b22fa4 100644
--- a/resources/osd/default.mcm
+++ b/resources/osd/default.mcm
@@ -1419,39 +1419,34 @@ MAX7456
01010101
01010101
01010101
-10101000
01010101
01010101
-10000001
01010101
+01010001
01010101
-10000100
+01010101
+01001000
+00000000
00000101
-00010001
-00010010
-10100000
-10001000
-01010010
-00000100
-10101000
-01010010
-00000100
-10101000
-01010010
-00100000
-10001000
-00010010
-10100000
-10001000
-10000100
+00100010
+00101010
+10100001
+00100010
+00000000
+00001000
+00100010
+00010100
+00001000
+00100010
+00000010
+10100001
+00100010
+00101010
00000101
-00010001
-10000001
-01010101
-01010101
-10101000
-01010101
+01001000
+00000000
01010101
+01010001
01010101
01010101
01010101
@@ -1483,41 +1478,46 @@ MAX7456
01010101
01010101
01010101
+01010100
+00010101
01010101
+01010010
+10000101
01010101
-00101010
+01001000
+00100001
01010101
+00100001
+01001000
01010101
-01000010
-01000001
-01010001
-01010010
-00101000
+00100001
01001000
-01010100
-00100010
+01010001
+00100001
00001000
-01010101
-00101000
01001000
-01010101
+00100000
+10000001
00100010
-00001000
-00010101
-00101000
-01001010
-10000100
-01000001
-01010000
-00010010
-01010101
-01010101
+00100010
+00100001
+00100010
+00100010
+00100001
+00100010
+00100010
+00100001
01000010
-01010101
-01010101
-00101010
-01010101
-01010101
+00100010
+00000101
+01010010
+00100010
+00010101
+01010010
+00100010
+00010101
+01010100
+00000000
01010101
01010101
01010101
diff --git a/resources/osd/default/022.png b/resources/osd/default/022.png
index 308c53e4..7b3d90a3 100644
--- a/resources/osd/default/022.png
+++ b/resources/osd/default/022.png
Binary files differ
diff --git a/resources/osd/default/023.png b/resources/osd/default/023.png
index 3000ef29..7728ae16 100644
--- a/resources/osd/default/023.png
+++ b/resources/osd/default/023.png
Binary files differ
diff --git a/resources/osd/large.mcm b/resources/osd/large.mcm
index 6460a530..c5ddbda5 100644
--- a/resources/osd/large.mcm
+++ b/resources/osd/large.mcm
@@ -1419,39 +1419,34 @@ MAX7456
01010101
01010101
01010101
-10101000
01010101
01010101
-10000001
01010101
+01010001
01010101
-10000100
+01010101
+01001000
+00000000
00000101
-00010001
-00010010
-10100000
-10001000
-01010010
-00000100
-10101000
-01010010
-00000100
-10101000
-01010010
-00100000
-10001000
-00010010
-10100000
-10001000
-10000100
+00100010
+00101010
+10100001
+00100010
+00000000
+00001000
+00100010
+00010100
+00001000
+00100010
+00000010
+10100001
+00100010
+00101010
00000101
-00010001
-10000001
-01010101
-01010101
-10101000
-01010101
+01001000
+00000000
01010101
+01010001
01010101
01010101
01010101
@@ -1483,41 +1478,46 @@ MAX7456
01010101
01010101
01010101
+01010100
+00010101
01010101
+01010010
+10000101
01010101
-00101010
+01001000
+00100001
01010101
+00100001
+01001000
01010101
-01000010
-01000001
-01010001
-01010010
-00101000
+00100001
01001000
-01010100
-00100010
+01010001
+00100001
00001000
-01010101
-00101000
01001000
-01010101
+00100000
+10000001
00100010
-00001000
-00010101
-00101000
-01001010
-10000100
-01000001
-01010000
-00010010
-01010101
-01010101
+00100010
+00100001
+00100010
+00100010
+00100001
+00100010
+00100010
+00100001
01000010
-01010101
-01010101
-00101010
-01010101
-01010101
+00100010
+00000101
+01010010
+00100010
+00010101
+01010010
+00100010
+00010101
+01010100
+00000000
01010101
01010101
01010101
diff --git a/resources/osd/large/022.png b/resources/osd/large/022.png
index 308c53e4..7b3d90a3 100644
--- a/resources/osd/large/022.png
+++ b/resources/osd/large/022.png
Binary files differ
diff --git a/resources/osd/large/023.png b/resources/osd/large/023.png
index 3000ef29..7728ae16 100644
--- a/resources/osd/large/023.png
+++ b/resources/osd/large/023.png
Binary files differ
diff --git a/tabs/osd.js b/tabs/osd.js
index 4849f698..40c8b92b 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -7,7 +7,9 @@ SYM.RSSI = 0x01;
SYM.AH_RIGHT = 0x02;
SYM.AH_LEFT = 0x03;
SYM.THR = 0x04;
-SYM.THR1 = 0x05;
+SYM.AH_DECORATION_UP = 5;
+SYM.WIND_SPEED_HORIZONTAL = 22;
+SYM.WIND_SPEED_VERTICAL = 23;
SYM.FLY_M = 0x9C;
SYM.ON_M = 0x9B;
SYM.AH_CENTER_LINE = 0x26;
@@ -737,6 +739,38 @@ OSD.constants = {
min_version: '1.7.4',
preview: FONT.symbol(SYM.GPS_HDP1) + FONT.symbol(SYM.GPS_HDP2) + FONT.embed_dot('1.8')
},
+ {
+ name: 'WIND_SPEED_HORIZONTAL',
+ id: 47,
+ min_version: '2.0.0',
+ preview: function(osd_data) {
+ // 6 chars
+ var p = FONT.symbol(SYM.WIND_SPEED_HORIZONTAL) + FONT.symbol(SYM.DIRECTION + 1);
+ if (OSD.data.preferences.units === 0 || OSD.data.preferences.units === 2) {
+ // Imperial
+ p += FONT.embed_dot('3.27') + FONT.symbol(SYM.MPH);
+ } else {
+ p += FONT.embed_dot('5.27') + FONT.symbol(SYM.KMH);
+ }
+ return p;
+ }
+ },
+ {
+ name: 'WIND_SPEED_VERTICAL',
+ id: 48,
+ min_version: '2.0.0',
+ preview: function(osd_data) {
+ // 6 chars
+ var p = FONT.symbol(SYM.WIND_SPEED_VERTICAL) + FONT.symbol(SYM.AH_DECORATION_UP);
+ if (OSD.data.preferences.units === 0 || OSD.data.preferences.units === 2) {
+ // Imperial
+ p += FONT.embed_dot('1.03') + FONT.symbol(SYM.MPH);
+ } else {
+ p += FONT.embed_dot('1.67') + FONT.symbol(SYM.KMH);
+ }
+ return p;
+ }
+ },
]
},
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-14 11:25:16 +0300