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:
authorAlberto García Hierro <alberto@garciahierro.com>2017-09-29 23:06:48 +0300
committerAlberto García Hierro <alberto@garciahierro.com>2017-09-29 23:06:48 +0300
commit559ca3068f60f93c972a3ff224fd3b5b373a4b73 (patch)
tree702aa1172364a4f5d1629a8abdc5c78ed5eecef8
parent968905a5138c19db63ce4bc54d39429479f7cce5 (diff)
Add AIR symbol and use it for OSD_AIR_SPEED preview
-rw-r--r--resources/osd/bold.mcm42
-rw-r--r--resources/osd/bold/151.pngbin0 -> 153 bytes
-rw-r--r--resources/osd/default.mcm42
-rw-r--r--resources/osd/default/151.pngbin0 -> 153 bytes
-rw-r--r--resources/osd/large.mcm42
-rw-r--r--resources/osd/large/151.pngbin0 -> 153 bytes
-rw-r--r--tabs/osd.js12
7 files changed, 74 insertions, 64 deletions
diff --git a/resources/osd/bold.mcm b/resources/osd/bold.mcm
index 6711faa1..b1ca7a53 100644
--- a/resources/osd/bold.mcm
+++ b/resources/osd/bold.mcm
@@ -9681,27 +9681,27 @@ MAX7456
01010101
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00000000
+00000000
+00000000
+00001000
+00100010
+10000000
+00100010
+00100010
+00100000
+00101010
+00100010
+10000000
+00100010
+00100010
+00100000
+00100010
+00100010
+00100000
+00000000
+00000000
+00000000
01010101
01010101
01010101
diff --git a/resources/osd/bold/151.png b/resources/osd/bold/151.png
new file mode 100644
index 00000000..94191e97
--- /dev/null
+++ b/resources/osd/bold/151.png
Binary files differ
diff --git a/resources/osd/default.mcm b/resources/osd/default.mcm
index 62c39a1c..1b4119d8 100644
--- a/resources/osd/default.mcm
+++ b/resources/osd/default.mcm
@@ -9681,27 +9681,27 @@ MAX7456
01010101
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00000000
+00000000
+00000000
+00001000
+00100010
+10000000
+00100010
+00100010
+00100000
+00101010
+00100010
+10000000
+00100010
+00100010
+00100000
+00100010
+00100010
+00100000
+00000000
+00000000
+00000000
01010101
01010101
01010101
diff --git a/resources/osd/default/151.png b/resources/osd/default/151.png
new file mode 100644
index 00000000..94191e97
--- /dev/null
+++ b/resources/osd/default/151.png
Binary files differ
diff --git a/resources/osd/large.mcm b/resources/osd/large.mcm
index a9e793a5..9d052ee7 100644
--- a/resources/osd/large.mcm
+++ b/resources/osd/large.mcm
@@ -9681,27 +9681,27 @@ MAX7456
01010101
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00000000
+00000000
+00000000
+00001000
+00100010
+10000000
+00100010
+00100010
+00100000
+00101010
+00100010
+10000000
+00100010
+00100010
+00100000
+00100010
+00100010
+00100000
+00000000
+00000000
+00000000
01010101
01010101
01010101
diff --git a/resources/osd/large/151.png b/resources/osd/large/151.png
new file mode 100644
index 00000000..94191e97
--- /dev/null
+++ b/resources/osd/large/151.png
Binary files differ
diff --git a/tabs/osd.js b/tabs/osd.js
index 5b20577f..f9d6fec0 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -27,6 +27,7 @@ SYM.ALT_M = 177;
SYM.ALT_FT = 179;
SYM.LAT = 0xA6;
SYM.LON = 0xA7;
+SYM.AIR = 151;
SYM.DIR_TO_HOME = 0x60;
SYM.DIST_KM = 182;
SYM.DIST_MI = 184;
@@ -342,7 +343,16 @@ OSD.constants = {
enabled: function() {
return SENSOR_CONFIG.pitot != 0;
},
- preview: '55' + FONT.symbol(SYM.KMH)
+ preview: function(osd_data) {
+ var speed;
+ if (OSD.data.unit_mode === 0) {
+ // Imperial
+ speed = ' 35' + FONT.symbol(SYM.MPH);
+ } else {
+ speed = ' 55' + FONT.symbol(SYM.KMH);
+ }
+ return FONT.symbol(SYM.AIR) + speed;
+ }
},
{
name: 'RTC_TIME',