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:
authorKonstantin Sharlaimov <konstantin.sharlaimov@gmail.com>2018-05-08 08:02:28 +0300
committerGitHub <noreply@github.com>2018-05-08 08:02:28 +0300
commite216d32850e23bee63a0a0f42a18f9f8c68fa3b3 (patch)
tree9d516770d3b68fb87dd6ae35d7a5a592178e30c7
parentcf176f220123926d2b8c0b1310a7603210c08f5b (diff)
parent845a14ca1d5048288da9dcf7cfbf606338b4c992 (diff)
Merge pull request #435 from shellixyz/add_pitch_and_roll_attitude_angle_in_osd
Add pitch and roll attitude angles OSD items
-rw-r--r--resources/osd/bold.mcm340
-rw-r--r--resources/osd/bold/204.pngbin0 -> 230 bytes
-rw-r--r--resources/osd/bold/205.pngbin0 -> 216 bytes
-rw-r--r--resources/osd/bold/206.pngbin0 -> 235 bytes
-rw-r--r--resources/osd/bold/207.pngbin0 -> 219 bytes
-rw-r--r--resources/osd/bold/223.pngbin0 -> 230 bytes
-rw-r--r--resources/osd/default.mcm340
-rw-r--r--resources/osd/default/204.pngbin0 -> 230 bytes
-rw-r--r--resources/osd/default/205.pngbin0 -> 216 bytes
-rw-r--r--resources/osd/default/206.pngbin0 -> 235 bytes
-rw-r--r--resources/osd/default/207.pngbin0 -> 219 bytes
-rw-r--r--resources/osd/default/223.pngbin0 -> 230 bytes
-rw-r--r--resources/osd/large.mcm340
-rw-r--r--resources/osd/large/204.pngbin0 -> 230 bytes
-rw-r--r--resources/osd/large/205.pngbin0 -> 216 bytes
-rw-r--r--resources/osd/large/206.pngbin0 -> 235 bytes
-rw-r--r--resources/osd/large/207.pngbin0 -> 219 bytes
-rw-r--r--resources/osd/large/223.pngbin0 -> 230 bytes
-rw-r--r--tabs/osd.js17
19 files changed, 527 insertions, 510 deletions
diff --git a/resources/osd/bold.mcm b/resources/osd/bold.mcm
index a94edbf0..df9d8a6d 100644
--- a/resources/osd/bold.mcm
+++ b/resources/osd/bold.mcm
@@ -13059,16 +13059,52 @@ MAX7456
01010101
01010101
01010101
+01010100
+00000001
+01010100
+00000000
+10100001
+01000000
+10101010
+00000001
+01001010
+00000000
+00010101
+01000000
+00010101
01010101
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13089,6 +13125,15 @@ MAX7456
01010101
01010101
01010101
+01000000
+00000000
+00000001
+01001010
+10101010
+10100001
+01000000
+00000000
+00000001
01010101
01010101
01010101
@@ -13096,11 +13141,34 @@ MAX7456
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13118,17 +13186,53 @@ MAX7456
01010101
01010101
01010101
+01000000
+00010101
01010101
+01001010
+00000000
+00010101
+01000000
+10101010
+00000001
+01010100
+00000000
+10100001
01010101
+01010100
+00000001
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13144,159 +13248,55 @@ MAX7456
01010101
01010101
01010101
+01000101
01010101
01010101
+00100001
01010101
+01010100
+10101000
01010101
+01010010
+10101010
+00010101
+01001010
+10101010
+10000101
+00000000
+00000000
+00000001
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10000001
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00010101
01010101
01010101
01010101
@@ -14275,55 +14275,55 @@ MAX7456
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10000001
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
01010101
+00010101
01010101
01010101
01010101
01010101
+00000000
+00000000
+00000001
+01001010
+10101010
+10000101
+01010010
+10101010
+00010101
+01010100
+10101000
01010101
01010101
+00100001
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01000101
01010101
01010101
01010101
diff --git a/resources/osd/bold/204.png b/resources/osd/bold/204.png
new file mode 100644
index 00000000..9abe8d16
--- /dev/null
+++ b/resources/osd/bold/204.png
Binary files differ
diff --git a/resources/osd/bold/205.png b/resources/osd/bold/205.png
new file mode 100644
index 00000000..386fdafb
--- /dev/null
+++ b/resources/osd/bold/205.png
Binary files differ
diff --git a/resources/osd/bold/206.png b/resources/osd/bold/206.png
new file mode 100644
index 00000000..15071c51
--- /dev/null
+++ b/resources/osd/bold/206.png
Binary files differ
diff --git a/resources/osd/bold/207.png b/resources/osd/bold/207.png
new file mode 100644
index 00000000..19a7d2ff
--- /dev/null
+++ b/resources/osd/bold/207.png
Binary files differ
diff --git a/resources/osd/bold/223.png b/resources/osd/bold/223.png
new file mode 100644
index 00000000..eedc8ea6
--- /dev/null
+++ b/resources/osd/bold/223.png
Binary files differ
diff --git a/resources/osd/default.mcm b/resources/osd/default.mcm
index c42f7d8f..1d14e010 100644
--- a/resources/osd/default.mcm
+++ b/resources/osd/default.mcm
@@ -13059,16 +13059,52 @@ MAX7456
01010101
01010101
01010101
+01010100
+00000001
+01010100
+00000000
+10100001
+01000000
+10101010
+00000001
+01001010
+00000000
+00010101
+01000000
+00010101
01010101
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13089,6 +13125,15 @@ MAX7456
01010101
01010101
01010101
+01000000
+00000000
+00000001
+01001010
+10101010
+10100001
+01000000
+00000000
+00000001
01010101
01010101
01010101
@@ -13096,11 +13141,34 @@ MAX7456
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13118,17 +13186,53 @@ MAX7456
01010101
01010101
01010101
+01000000
+00010101
01010101
+01001010
+00000000
+00010101
+01000000
+10101010
+00000001
+01010100
+00000000
+10100001
01010101
+01010100
+00000001
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13144,159 +13248,55 @@ MAX7456
01010101
01010101
01010101
+01000101
01010101
01010101
+00100001
01010101
+01010100
+10101000
01010101
+01010010
+10101010
+00010101
+01001010
+10101010
+10000101
+00000000
+00000000
+00000001
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10000001
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00010101
01010101
01010101
01010101
@@ -14275,55 +14275,55 @@ MAX7456
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10000001
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
01010101
+00010101
01010101
01010101
01010101
01010101
+00000000
+00000000
+00000001
+01001010
+10101010
+10000101
+01010010
+10101010
+00010101
+01010100
+10101000
01010101
01010101
+00100001
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01000101
01010101
01010101
01010101
diff --git a/resources/osd/default/204.png b/resources/osd/default/204.png
new file mode 100644
index 00000000..9abe8d16
--- /dev/null
+++ b/resources/osd/default/204.png
Binary files differ
diff --git a/resources/osd/default/205.png b/resources/osd/default/205.png
new file mode 100644
index 00000000..386fdafb
--- /dev/null
+++ b/resources/osd/default/205.png
Binary files differ
diff --git a/resources/osd/default/206.png b/resources/osd/default/206.png
new file mode 100644
index 00000000..15071c51
--- /dev/null
+++ b/resources/osd/default/206.png
Binary files differ
diff --git a/resources/osd/default/207.png b/resources/osd/default/207.png
new file mode 100644
index 00000000..19a7d2ff
--- /dev/null
+++ b/resources/osd/default/207.png
Binary files differ
diff --git a/resources/osd/default/223.png b/resources/osd/default/223.png
new file mode 100644
index 00000000..eedc8ea6
--- /dev/null
+++ b/resources/osd/default/223.png
Binary files differ
diff --git a/resources/osd/large.mcm b/resources/osd/large.mcm
index 5a174ec1..35e3e1cc 100644
--- a/resources/osd/large.mcm
+++ b/resources/osd/large.mcm
@@ -13059,16 +13059,52 @@ MAX7456
01010101
01010101
01010101
+01010100
+00000001
+01010100
+00000000
+10100001
+01000000
+10101010
+00000001
+01001010
+00000000
+00010101
+01000000
+00010101
01010101
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13089,6 +13125,15 @@ MAX7456
01010101
01010101
01010101
+01000000
+00000000
+00000001
+01001010
+10101010
+10100001
+01000000
+00000000
+00000001
01010101
01010101
01010101
@@ -13096,11 +13141,34 @@ MAX7456
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13118,17 +13186,53 @@ MAX7456
01010101
01010101
01010101
+01000000
+00010101
01010101
+01001010
+00000000
+00010101
+01000000
+10101010
+00000001
+01010100
+00000000
+10100001
01010101
+01010100
+00000001
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10001010
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
01010101
+00010100
01010101
01010101
01010101
@@ -13144,159 +13248,55 @@ MAX7456
01010101
01010101
01010101
+01000101
01010101
01010101
+00100001
01010101
+01010100
+10101000
01010101
+01010010
+10101010
+00010101
+01001010
+10101010
+10000101
+00000000
+00000000
+00000001
01010101
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10000001
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+00010101
01010101
01010101
01010101
@@ -14275,55 +14275,55 @@ MAX7456
01010101
01010101
01010101
+00000001
01010101
+01010100
+10101000
01010101
+01010100
+10000010
+00010101
+01010100
+10000010
+00010101
+01010100
+10101000
01010101
+01010100
+10000001
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
+01010100
+10000101
01010101
01010101
+00010101
01010101
01010101
01010101
01010101
+00000000
+00000000
+00000001
+01001010
+10101010
+10000101
+01010010
+10101010
+00010101
+01010100
+10101000
01010101
01010101
+00100001
01010101
01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
-01010101
+01000101
01010101
01010101
01010101
diff --git a/resources/osd/large/204.png b/resources/osd/large/204.png
new file mode 100644
index 00000000..9abe8d16
--- /dev/null
+++ b/resources/osd/large/204.png
Binary files differ
diff --git a/resources/osd/large/205.png b/resources/osd/large/205.png
new file mode 100644
index 00000000..386fdafb
--- /dev/null
+++ b/resources/osd/large/205.png
Binary files differ
diff --git a/resources/osd/large/206.png b/resources/osd/large/206.png
new file mode 100644
index 00000000..15071c51
--- /dev/null
+++ b/resources/osd/large/206.png
Binary files differ
diff --git a/resources/osd/large/207.png b/resources/osd/large/207.png
new file mode 100644
index 00000000..19a7d2ff
--- /dev/null
+++ b/resources/osd/large/207.png
Binary files differ
diff --git a/resources/osd/large/223.png b/resources/osd/large/223.png
new file mode 100644
index 00000000..eedc8ea6
--- /dev/null
+++ b/resources/osd/large/223.png
Binary files differ
diff --git a/tabs/osd.js b/tabs/osd.js
index 9212c9fa..429608b0 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -52,6 +52,11 @@ SYM.FT_S = 153;
SYM.CLOCK = 0xBC;
SYM.ZERO_HALF_TRAILING_DOT = 192;
SYM.ZERO_HALF_LEADING_DOT = 208;
+SYM.ROLL_LEFT = 0xCC;
+SYM.ROLL_LEVEL = 0xCD;
+SYM.ROLL_RIGHT = 0xCE;
+SYM.PITCH_UP = 0xCF;
+SYM.PITCH_DOWN = 0xDF;
SYM.LAST_CHAR = 190;
var FONT = FONT || {};
@@ -593,6 +598,18 @@ OSD.constants = {
id: 4,
positionable: false
},
+ {
+ name: 'PITCH_ANGLE',
+ id: 41,
+ min_version: '2.0.0',
+ preview: FONT.symbol(SYM.PITCH_UP) + '2'
+ },
+ {
+ name: 'ROLL_ANGLE',
+ id: 42,
+ min_version: '2.0.0',
+ preview: FONT.symbol(SYM.ROLL_LEFT) + '5'
+ },
]
},
{