diff --git a/CREDITS.txt b/CREDITS.txt index bd1c3497d..4eccb7e45 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -30,6 +30,14 @@ N: David "Buzz" Carlson E: chebuzz (plus) openpilot (at) gmail (dot) com D: 3D ModelView GCS Plugin +N: Corvus Corax +E: corvus (dot) corax (at) cybertrench (dot) com +D: IL2 HITL GCS Plugin, Posix OpenPilot, Advanced Stabalisation module + +N: James Cotton +E: peabody124 (plus) openpilot (at) gmail (dot) com +D: HID implimentation, GCS Joystick control, Posix OpenPilot work + N: Frederic Goddeeris E: fredericgoddeeris (at) hotmail (dot) com D: I2C work and FreeRTOS work, MK intergration @@ -63,15 +71,15 @@ D: Artwork including display dials N: Ken Northup E: helos360 (at) bellsouth (dot) net -D: Test 3D Modelling, unused in production. +D: 3D Modelling, Easystar adaption from FMS N: Guy McCaldin E: guymcc (at) gmail (dot) com -D: Artwork and design lead +D: Artwork and design dials N: Cathy Moss E: cmoss296 (at) blueyonder (dot) co (dot) uk -D: OP Map Plugin +D: OP Map Plugin, PipBee Pro Modem N: Angus Peart E: gussy (at) openpilot (dot) org @@ -101,7 +109,11 @@ D: Picoc creator as used in the flight N: Stacey Sheldon E: stac (at) solidgoldbomb (dot) org D: Core embedded developer -D: SPI protocol for AHRS, IRQ and HID stability fixes and core AHRS work. +D: SPI protocol for AHRS, I2C work and various core work + +N: Erhard Siegl +E: Erhard (dot) Siegl (at) zogazoga (dot) at +D: Configuration engine for the GCS N: Pete Stapley E: pete (at) stapleylabs (dot) com @@ -111,6 +123,10 @@ N: Rowan Taubitz E: rowan (at) zantek (dot) com (dot) au D: Hardware debugging and testing, creation of 2-layer Floss-JTAG board +N: Andrew Thoms +E: electronics (at) andrewspizza (dot) net +D: IP Telemtry plugin for the GCS + N: Vassilis Varveropoulos E: vassilis (at) openpilot (dot) org D: Co-founder, Principal embedded software architect. diff --git a/artwork/Dials/guymc/Text as Text/altimeter.svg b/artwork/Dials/guymc/Text as Text/altimeter.svg index 93ae051bb..a734658dd 100644 --- a/artwork/Dials/guymc/Text as Text/altimeter.svg +++ b/artwork/Dials/guymc/Text as Text/altimeter.svg @@ -1,3277 +1,3276 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 -1 -2 -Altitude -m -3 -4 -5 -6 -7 -8 -9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 +1 +2 +Altitude +m +3 +4 +5 +6 +7 +8 +9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/artwork/Dials/guymc/Text as Text/speed.svg b/artwork/Dials/guymc/Text as Text/speed.svg index fe686cf1f..53260e356 100644 --- a/artwork/Dials/guymc/Text as Text/speed.svg +++ b/artwork/Dials/guymc/Text as Text/speed.svg @@ -1,3082 +1,3081 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 -20 -40 -60 -80 -100 -120 -140 -160 -180 -200 -Speed -km/h - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 +20 +40 +60 +80 +100 +120 +140 +160 +180 +200 +Speed +km/h + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/artwork/Dials/guymc/Text as Text/vsi.svg b/artwork/Dials/guymc/Text as Text/vsi.svg index 662932c03..1d0c58974 100644 --- a/artwork/Dials/guymc/Text as Text/vsi.svg +++ b/artwork/Dials/guymc/Text as Text/vsi.svg @@ -1,2979 +1,2978 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VSI -m/s -0 --2 --4 -2 -4 -6 -8 -10 --10 --8 --6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + VSI +m/s +0 +-2 +-4 +2 +4 +6 +8 +10 +-10 +-8 +-6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/artwork/Dials/guymc/altimeter.svg b/artwork/Dials/guymc/altimeter.svg index 76fc1533a..eaabc6d02 100644 --- a/artwork/Dials/guymc/altimeter.svg +++ b/artwork/Dials/guymc/altimeter.svg @@ -1,3286 +1,3285 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/artwork/Dials/guymc/speed.svg b/artwork/Dials/guymc/speed.svg index 7a459b099..11139ce82 100644 --- a/artwork/Dials/guymc/speed.svg +++ b/artwork/Dials/guymc/speed.svg @@ -1,3011 +1,3010 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/artwork/Dials/guymc/vsi.svg b/artwork/Dials/guymc/vsi.svg index f733a2f18..720e68e80 100644 --- a/artwork/Dials/guymc/vsi.svg +++ b/artwork/Dials/guymc/vsi.svg @@ -1,3016 +1,3015 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/artwork/GCS Icons/general.svg b/artwork/GCS Icons/general.svg new file mode 100644 index 000000000..eebcb5145 --- /dev/null +++ b/artwork/GCS Icons/general.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + General + diff --git a/artwork/GCS Icons/selected.svg b/artwork/GCS Icons/selected.svg new file mode 100644 index 000000000..f047fcb75 --- /dev/null +++ b/artwork/GCS Icons/selected.svg @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + General + diff --git a/artwork/Misc/mapquad.svg b/artwork/Misc/mapquad.svg new file mode 100644 index 000000000..d17424407 --- /dev/null +++ b/artwork/Misc/mapquad.svg @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/ground/share/openpilotgcs/dials/guymc/altimeter.svg b/ground/share/openpilotgcs/dials/guymc/altimeter.svg index 76fc1533a..eaabc6d02 100644 --- a/ground/share/openpilotgcs/dials/guymc/altimeter.svg +++ b/ground/share/openpilotgcs/dials/guymc/altimeter.svg @@ -1,3286 +1,3285 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ground/share/openpilotgcs/dials/guymc/speed.svg b/ground/share/openpilotgcs/dials/guymc/speed.svg index 7a459b099..11139ce82 100644 --- a/ground/share/openpilotgcs/dials/guymc/speed.svg +++ b/ground/share/openpilotgcs/dials/guymc/speed.svg @@ -1,3011 +1,3010 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ground/share/openpilotgcs/dials/guymc/vsi.svg b/ground/share/openpilotgcs/dials/guymc/vsi.svg index f733a2f18..720e68e80 100644 --- a/ground/share/openpilotgcs/dials/guymc/vsi.svg +++ b/ground/share/openpilotgcs/dials/guymc/vsi.svg @@ -1,3016 +1,3015 @@ - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ground/share/openpilotgcs/sounds/Complete sound set.txt b/ground/share/openpilotgcs/sounds/Complete sound set.txt index 3799e14e5..14bea3094 100644 --- a/ground/share/openpilotgcs/sounds/Complete sound set.txt +++ b/ground/share/openpilotgcs/sounds/Complete sound set.txt @@ -1,6 +1,8 @@ -Sounds for the notifaction plugin +Sounds for the notification plugin. -All files should be normalized using http://normalize.nongnu.org/ with no options. +Before being included, all files should be normalized using http://normalize.nongnu.org/ with no options. + +Do not however re-normalise the files already here. Work in progress, any ideas PM me - dankers. @@ -11,7 +13,7 @@ beepsound whoopsound -Spoken Collections (sorted alphabetically): +Spoken Collection (sorted alphabetically): aborted active @@ -30,7 +32,7 @@ complete connected connection control -critical battery +critical disabled disconnected feet @@ -51,7 +53,6 @@ KPH landing launch left -lock logging lost low altitude @@ -120,3 +121,9 @@ ninety hundread thousand + +Upto: OpenPilot +critical +battery +point + diff --git a/ground/share/openpilotgcs/sounds/License.txt b/ground/share/openpilotgcs/sounds/License.txt index 4c7583082..569fea1ed 100644 --- a/ground/share/openpilotgcs/sounds/License.txt +++ b/ground/share/openpilotgcs/sounds/License.txt @@ -9,8 +9,3 @@ OpenPilot wishes to thank Guitar Guy 1985 for his work on the alarms, 3 of his s alarmsound beepsound whoopsound - - - - - \ No newline at end of file diff --git a/ground/share/openpilotgcs/sounds/default/KPH.wav b/ground/share/openpilotgcs/sounds/default/KPH.wav index 5f1af2c00..a7c5de324 100644 Binary files a/ground/share/openpilotgcs/sounds/default/KPH.wav and b/ground/share/openpilotgcs/sounds/default/KPH.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/MPH.wav b/ground/share/openpilotgcs/sounds/default/MPH.wav index 9108eb968..f7c0528b8 100644 Binary files a/ground/share/openpilotgcs/sounds/default/MPH.wav and b/ground/share/openpilotgcs/sounds/default/MPH.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/aborted.wav b/ground/share/openpilotgcs/sounds/default/aborted.wav index e9dfd5db8..15fbba134 100644 Binary files a/ground/share/openpilotgcs/sounds/default/aborted.wav and b/ground/share/openpilotgcs/sounds/default/aborted.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/active.wav b/ground/share/openpilotgcs/sounds/default/active.wav index 853270644..c663be49f 100644 Binary files a/ground/share/openpilotgcs/sounds/default/active.wav and b/ground/share/openpilotgcs/sounds/default/active.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/alert.wav b/ground/share/openpilotgcs/sounds/default/alert.wav index 9fbd7547f..b17cea62c 100644 Binary files a/ground/share/openpilotgcs/sounds/default/alert.wav and b/ground/share/openpilotgcs/sounds/default/alert.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/altitude.wav b/ground/share/openpilotgcs/sounds/default/altitude.wav index 432b8b425..770ed1dbc 100644 Binary files a/ground/share/openpilotgcs/sounds/default/altitude.wav and b/ground/share/openpilotgcs/sounds/default/altitude.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/amps.wav b/ground/share/openpilotgcs/sounds/default/amps.wav index 742089492..8370276c3 100644 Binary files a/ground/share/openpilotgcs/sounds/default/amps.wav and b/ground/share/openpilotgcs/sounds/default/amps.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/aquired.wav b/ground/share/openpilotgcs/sounds/default/aquired.wav index 935a0f502..a217bbfe3 100644 Binary files a/ground/share/openpilotgcs/sounds/default/aquired.wav and b/ground/share/openpilotgcs/sounds/default/aquired.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/auto flight.wav b/ground/share/openpilotgcs/sounds/default/auto flight.wav index cea283a70..84228234b 100644 Binary files a/ground/share/openpilotgcs/sounds/default/auto flight.wav and b/ground/share/openpilotgcs/sounds/default/auto flight.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/battery critical.wav b/ground/share/openpilotgcs/sounds/default/battery critical.wav deleted file mode 100644 index edef0beb0..000000000 Binary files a/ground/share/openpilotgcs/sounds/default/battery critical.wav and /dev/null differ diff --git a/ground/share/openpilotgcs/sounds/default/battery.wav b/ground/share/openpilotgcs/sounds/default/battery.wav index 2813ee706..fbfa37563 100644 Binary files a/ground/share/openpilotgcs/sounds/default/battery.wav and b/ground/share/openpilotgcs/sounds/default/battery.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/camera.wav b/ground/share/openpilotgcs/sounds/default/camera.wav index 10ef12859..e363e9e54 100644 Binary files a/ground/share/openpilotgcs/sounds/default/camera.wav and b/ground/share/openpilotgcs/sounds/default/camera.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/cancelled.wav b/ground/share/openpilotgcs/sounds/default/cancelled.wav index d0520b9bf..210a2dad2 100644 Binary files a/ground/share/openpilotgcs/sounds/default/cancelled.wav and b/ground/share/openpilotgcs/sounds/default/cancelled.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/changed.wav b/ground/share/openpilotgcs/sounds/default/changed.wav index a17feb8e0..322472139 100644 Binary files a/ground/share/openpilotgcs/sounds/default/changed.wav and b/ground/share/openpilotgcs/sounds/default/changed.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/circle position.wav b/ground/share/openpilotgcs/sounds/default/circle position.wav index 62da14a63..170f818b7 100644 Binary files a/ground/share/openpilotgcs/sounds/default/circle position.wav and b/ground/share/openpilotgcs/sounds/default/circle position.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/cleared.wav b/ground/share/openpilotgcs/sounds/default/cleared.wav index 6f97877bf..b013ff5e4 100644 Binary files a/ground/share/openpilotgcs/sounds/default/cleared.wav and b/ground/share/openpilotgcs/sounds/default/cleared.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/complete.wav b/ground/share/openpilotgcs/sounds/default/complete.wav index d84855209..a02332280 100644 Binary files a/ground/share/openpilotgcs/sounds/default/complete.wav and b/ground/share/openpilotgcs/sounds/default/complete.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/connected.wav b/ground/share/openpilotgcs/sounds/default/connected.wav index 8b52a6df6..b0df63a1c 100644 Binary files a/ground/share/openpilotgcs/sounds/default/connected.wav and b/ground/share/openpilotgcs/sounds/default/connected.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/connection.wav b/ground/share/openpilotgcs/sounds/default/connection.wav index 18cabd6d8..a6132d802 100644 Binary files a/ground/share/openpilotgcs/sounds/default/connection.wav and b/ground/share/openpilotgcs/sounds/default/connection.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/control.wav b/ground/share/openpilotgcs/sounds/default/control.wav index ccd2e3a45..5224ecbae 100644 Binary files a/ground/share/openpilotgcs/sounds/default/control.wav and b/ground/share/openpilotgcs/sounds/default/control.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/critical battery.wav b/ground/share/openpilotgcs/sounds/default/critical battery.wav deleted file mode 100644 index 9f7b38ac9..000000000 Binary files a/ground/share/openpilotgcs/sounds/default/critical battery.wav and /dev/null differ diff --git a/ground/share/openpilotgcs/sounds/default/disabled.wav b/ground/share/openpilotgcs/sounds/default/disabled.wav index b1a83cffb..e59e78eb0 100644 Binary files a/ground/share/openpilotgcs/sounds/default/disabled.wav and b/ground/share/openpilotgcs/sounds/default/disabled.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/disconnected.wav b/ground/share/openpilotgcs/sounds/default/disconnected.wav index ad456620a..cc956335e 100644 Binary files a/ground/share/openpilotgcs/sounds/default/disconnected.wav and b/ground/share/openpilotgcs/sounds/default/disconnected.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/feet.wav b/ground/share/openpilotgcs/sounds/default/feet.wav index cac414298..95c4fa055 100644 Binary files a/ground/share/openpilotgcs/sounds/default/feet.wav and b/ground/share/openpilotgcs/sounds/default/feet.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/figure eight.wav b/ground/share/openpilotgcs/sounds/default/figure eight.wav index 6dd8e3ef9..2f84644c3 100644 Binary files a/ground/share/openpilotgcs/sounds/default/figure eight.wav and b/ground/share/openpilotgcs/sounds/default/figure eight.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/flight.wav b/ground/share/openpilotgcs/sounds/default/flight.wav index 18aba245d..8c016d5ad 100644 Binary files a/ground/share/openpilotgcs/sounds/default/flight.wav and b/ground/share/openpilotgcs/sounds/default/flight.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/geofence.wav b/ground/share/openpilotgcs/sounds/default/geofence.wav index 8c90412cf..6136ebb79 100644 Binary files a/ground/share/openpilotgcs/sounds/default/geofence.wav and b/ground/share/openpilotgcs/sounds/default/geofence.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/gps.wav b/ground/share/openpilotgcs/sounds/default/gps.wav index 8c068178f..e4e61e331 100644 Binary files a/ground/share/openpilotgcs/sounds/default/gps.wav and b/ground/share/openpilotgcs/sounds/default/gps.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/ground station.wav b/ground/share/openpilotgcs/sounds/default/ground station.wav index 584cae9c7..98e7b0d9e 100644 Binary files a/ground/share/openpilotgcs/sounds/default/ground station.wav and b/ground/share/openpilotgcs/sounds/default/ground station.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/heading.wav b/ground/share/openpilotgcs/sounds/default/heading.wav index 4f5946825..5f0871075 100644 Binary files a/ground/share/openpilotgcs/sounds/default/heading.wav and b/ground/share/openpilotgcs/sounds/default/heading.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/height.wav b/ground/share/openpilotgcs/sounds/default/height.wav index dc7c61d6a..242436d52 100644 Binary files a/ground/share/openpilotgcs/sounds/default/height.wav and b/ground/share/openpilotgcs/sounds/default/height.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/high.wav b/ground/share/openpilotgcs/sounds/default/high.wav index 9b4ac2377..b6b4df0ef 100644 Binary files a/ground/share/openpilotgcs/sounds/default/high.wav and b/ground/share/openpilotgcs/sounds/default/high.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/hippodrome.wav b/ground/share/openpilotgcs/sounds/default/hippodrome.wav index 134cf5a59..227aa0267 100644 Binary files a/ground/share/openpilotgcs/sounds/default/hippodrome.wav and b/ground/share/openpilotgcs/sounds/default/hippodrome.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/hold position.wav b/ground/share/openpilotgcs/sounds/default/hold position.wav index b3a957e82..d85acdb7a 100644 Binary files a/ground/share/openpilotgcs/sounds/default/hold position.wav and b/ground/share/openpilotgcs/sounds/default/hold position.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/home location.wav b/ground/share/openpilotgcs/sounds/default/home location.wav index e59343602..fb003298d 100644 Binary files a/ground/share/openpilotgcs/sounds/default/home location.wav and b/ground/share/openpilotgcs/sounds/default/home location.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/initialised.wav b/ground/share/openpilotgcs/sounds/default/initialised.wav index 4247b7343..6fb39b3e1 100644 Binary files a/ground/share/openpilotgcs/sounds/default/initialised.wav and b/ground/share/openpilotgcs/sounds/default/initialised.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/initiated.wav b/ground/share/openpilotgcs/sounds/default/initiated.wav index d30e6ae57..5ebf071c4 100644 Binary files a/ground/share/openpilotgcs/sounds/default/initiated.wav and b/ground/share/openpilotgcs/sounds/default/initiated.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/landing.wav b/ground/share/openpilotgcs/sounds/default/landing.wav index e98ba9d76..799562a79 100644 Binary files a/ground/share/openpilotgcs/sounds/default/landing.wav and b/ground/share/openpilotgcs/sounds/default/landing.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/launch.wav b/ground/share/openpilotgcs/sounds/default/launch.wav index 0b2fadb6e..3a3d5b885 100644 Binary files a/ground/share/openpilotgcs/sounds/default/launch.wav and b/ground/share/openpilotgcs/sounds/default/launch.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/left.wav b/ground/share/openpilotgcs/sounds/default/left.wav index a0ad1ed83..6a7c8e4f8 100644 Binary files a/ground/share/openpilotgcs/sounds/default/left.wav and b/ground/share/openpilotgcs/sounds/default/left.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/lock.wav b/ground/share/openpilotgcs/sounds/default/lock.wav deleted file mode 100644 index 7d0b705a9..000000000 Binary files a/ground/share/openpilotgcs/sounds/default/lock.wav and /dev/null differ diff --git a/ground/share/openpilotgcs/sounds/default/logging.wav b/ground/share/openpilotgcs/sounds/default/logging.wav index e06e0462e..70578f2d6 100644 Binary files a/ground/share/openpilotgcs/sounds/default/logging.wav and b/ground/share/openpilotgcs/sounds/default/logging.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/lost.wav b/ground/share/openpilotgcs/sounds/default/lost.wav index 70e8cfb8e..fe76f2491 100644 Binary files a/ground/share/openpilotgcs/sounds/default/lost.wav and b/ground/share/openpilotgcs/sounds/default/lost.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/low altitude.wav b/ground/share/openpilotgcs/sounds/default/low altitude.wav index 7a6d0fe1a..cd5586f33 100644 Binary files a/ground/share/openpilotgcs/sounds/default/low altitude.wav and b/ground/share/openpilotgcs/sounds/default/low altitude.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/low battery.wav b/ground/share/openpilotgcs/sounds/default/low battery.wav index 1def8d79e..b50ee3e71 100644 Binary files a/ground/share/openpilotgcs/sounds/default/low battery.wav and b/ground/share/openpilotgcs/sounds/default/low battery.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/low gps quality.wav b/ground/share/openpilotgcs/sounds/default/low gps quality.wav index 3f773e58d..bcf9220ea 100644 Binary files a/ground/share/openpilotgcs/sounds/default/low gps quality.wav and b/ground/share/openpilotgcs/sounds/default/low gps quality.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/manual flight.wav b/ground/share/openpilotgcs/sounds/default/manual flight.wav index 6b94fb6a9..223ed597e 100644 Binary files a/ground/share/openpilotgcs/sounds/default/manual flight.wav and b/ground/share/openpilotgcs/sounds/default/manual flight.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/maximum.wav b/ground/share/openpilotgcs/sounds/default/maximum.wav index 0ec424011..0d0b15cff 100644 Binary files a/ground/share/openpilotgcs/sounds/default/maximum.wav and b/ground/share/openpilotgcs/sounds/default/maximum.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/meters.wav b/ground/share/openpilotgcs/sounds/default/meters.wav index d4dae391a..17b6767ca 100644 Binary files a/ground/share/openpilotgcs/sounds/default/meters.wav and b/ground/share/openpilotgcs/sounds/default/meters.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/minimum.wav b/ground/share/openpilotgcs/sounds/default/minimum.wav index a2702989f..ed03800c8 100644 Binary files a/ground/share/openpilotgcs/sounds/default/minimum.wav and b/ground/share/openpilotgcs/sounds/default/minimum.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/mode.wav b/ground/share/openpilotgcs/sounds/default/mode.wav index 6ede6b364..1b2a41756 100644 Binary files a/ground/share/openpilotgcs/sounds/default/mode.wav and b/ground/share/openpilotgcs/sounds/default/mode.wav differ diff --git a/ground/share/openpilotgcs/sounds/default/navigation.wav b/ground/share/openpilotgcs/sounds/default/navigation.wav index 8de7be1b2..c70a13132 100644 Binary files a/ground/share/openpilotgcs/sounds/default/navigation.wav and b/ground/share/openpilotgcs/sounds/default/navigation.wav differ diff --git a/ground/src/libs/opmapcontrol/src/mapwidget/images/mapquad.png b/ground/src/libs/opmapcontrol/src/mapwidget/images/mapquad.png new file mode 100644 index 000000000..8f968a277 Binary files /dev/null and b/ground/src/libs/opmapcontrol/src/mapwidget/images/mapquad.png differ diff --git a/ground/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc b/ground/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc index a5589c372..bdb546587 100644 --- a/ground/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc +++ b/ground/src/libs/opmapcontrol/src/mapwidget/mapresources.qrc @@ -9,5 +9,6 @@ images/home2.svg images/airplanepip.png images/EasystarBlue.png + images/mapquad.png diff --git a/ground/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp b/ground/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp index a62b6da98..474f62f2f 100644 --- a/ground/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp +++ b/ground/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp @@ -31,8 +31,9 @@ namespace mapcontrol UAVItem::UAVItem(MapGraphicItem* map,OPMapWidget* parent):map(map),mapwidget(parent),showtrail(true),trailtime(5),traildistance(50),autosetreached(true) ,autosetdistance(100) { - pic.load(QString::fromUtf8(":/markers/images/EasystarBlue.png")); - pic=pic.scaled(50,33,Qt::IgnoreAspectRatio); + pic.load(QString::fromUtf8(":/markers/images/mapquad.png")); + // Don't scale but trust the image we are given + // pic=pic.scaled(50,33,Qt::IgnoreAspectRatio); localposition=map->FromLatLngToLocal(mapwidget->CurrentPosition()); this->setPos(localposition.X(),localposition.Y()); this->setZValue(4); diff --git a/ground/src/plugins/coreplugin/core.qrc b/ground/src/plugins/coreplugin/core.qrc index bafb22e05..3be67f9d4 100644 --- a/ground/src/plugins/coreplugin/core.qrc +++ b/ground/src/plugins/coreplugin/core.qrc @@ -3,6 +3,7 @@ images/openpilot_logo_256.png images/openpilot_logo_128.png images/openpilot_logo_64.png + images/openpilot_logo_32.png images/clean_pane_small.png images/clear.png images/closebutton.png @@ -44,7 +45,7 @@ images/unlocked.png images/extension.png images/darkclosebutton.png - images/infoicon.png + images/pluginicon.png images/exiticon.png images/optionsicon.png images/helpicon.png diff --git a/ground/src/plugins/coreplugin/coreconstants.h b/ground/src/plugins/coreplugin/coreconstants.h index c4d53dbb0..c56145aaf 100644 --- a/ground/src/plugins/coreplugin/coreconstants.h +++ b/ground/src/plugins/coreplugin/coreconstants.h @@ -32,9 +32,9 @@ namespace Core { namespace Constants { -#define GCS_VERSION_MAJOR 0 +#define GCS_VERSION_MAJOR 1 #define GCS_VERSION_MINOR 0 -#define GCS_VERSION_RELEASE 1 +#define GCS_VERSION_RELEASE 0 #define STRINGIFY_INTERNAL(x) #x #define STRINGIFY(x) STRINGIFY_INTERNAL(x) @@ -212,7 +212,7 @@ const char * const ICON_REPLACE = ":/core/images/replace.png"; const char * const ICON_RESET = ":/core/images/reset.png"; const char * const ICON_MAGNIFIER = ":/core/images/magnifier.png"; const char * const ICON_TOGGLE_SIDEBAR = ":/core/images/sidebaricon.png"; -const char * const ICON_INFO = ":/core/images/infoicon.png"; +const char * const ICON_PLUGIN = ":/core/images/pluginicon.png"; const char * const ICON_EXIT = ":/core/images/exiticon.png"; const char * const ICON_OPTIONS = ":/core/images/optionsicon.png"; const char * const ICON_HELP = ":/core/images/helpicon.png"; diff --git a/ground/src/plugins/coreplugin/images/infoicon.png b/ground/src/plugins/coreplugin/images/infoicon.png deleted file mode 100644 index e37b9a3bb..000000000 Binary files a/ground/src/plugins/coreplugin/images/infoicon.png and /dev/null differ diff --git a/ground/src/plugins/coreplugin/images/openpilot_logo_32.png b/ground/src/plugins/coreplugin/images/openpilot_logo_32.png new file mode 100644 index 000000000..4aca4ac27 Binary files /dev/null and b/ground/src/plugins/coreplugin/images/openpilot_logo_32.png differ diff --git a/ground/src/plugins/coreplugin/images/pluginicon.png b/ground/src/plugins/coreplugin/images/pluginicon.png new file mode 100644 index 000000000..ba8f1585c Binary files /dev/null and b/ground/src/plugins/coreplugin/images/pluginicon.png differ diff --git a/ground/src/plugins/coreplugin/mainwindow.cpp b/ground/src/plugins/coreplugin/mainwindow.cpp index 84622b147..07b0ba8a8 100644 --- a/ground/src/plugins/coreplugin/mainwindow.cpp +++ b/ground/src/plugins/coreplugin/mainwindow.cpp @@ -645,7 +645,7 @@ void MainWindow::registerDefaultActions() #endif //About Plugins Action - tmpaction = new QAction(QIcon(Constants::ICON_INFO), tr("About &Plugins..."), this); + tmpaction = new QAction(QIcon(Constants::ICON_PLUGIN), tr("About &Plugins..."), this); cmd = am->registerAction(tmpaction, Constants::ABOUT_PLUGINS, m_globalContext); mhelp->addAction(cmd, Constants::G_HELP_ABOUT); tmpaction->setEnabled(true); diff --git a/ground/src/plugins/coreplugin/plugindialog.cpp b/ground/src/plugins/coreplugin/plugindialog.cpp index 81ac808e4..caeb1bb4e 100644 --- a/ground/src/plugins/coreplugin/plugindialog.cpp +++ b/ground/src/plugins/coreplugin/plugindialog.cpp @@ -68,6 +68,7 @@ PluginDialog::PluginDialog(QWidget *parent) resize(650, 400); setWindowTitle(tr("Installed Plugins")); + setWindowIcon(QIcon(":/core/images/pluginicon.png")); connect(m_view, SIGNAL(currentPluginChanged(ExtensionSystem::PluginSpec*)), this, SLOT(updateButtons())); diff --git a/ground/src/plugins/coreplugin/versiondialog.cpp b/ground/src/plugins/coreplugin/versiondialog.cpp index d2d9a89a3..20e317f4c 100644 --- a/ground/src/plugins/coreplugin/versiondialog.cpp +++ b/ground/src/plugins/coreplugin/versiondialog.cpp @@ -52,7 +52,7 @@ VersionDialog::VersionDialog(QWidget *parent) { // We need to set the window icon explicitly here since for some reason the // application icon isn't used when the size of the dialog is fixed (at least not on X11/GNOME) - setWindowIcon(QIcon(":/core/images/openpilot_logo_128.png")); + setWindowIcon(QIcon(":/core/images/openpilot_logo_32.png")); setWindowTitle(tr("About OpenPilot GCS")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);