diff --git a/artwork/3D Model/boards/OPGPS/OPGPS.3DS b/artwork/3D Model/boards/OPGPS/OPGPS.3DS new file mode 100644 index 000000000..c6bbed975 Binary files /dev/null and b/artwork/3D Model/boards/OPGPS/OPGPS.3DS differ diff --git a/artwork/3D Model/boards/OPGPS/OPGPS.jpg b/artwork/3D Model/boards/OPGPS/OPGPS.jpg new file mode 100644 index 000000000..319696a04 Binary files /dev/null and b/artwork/3D Model/boards/OPGPS/OPGPS.jpg differ diff --git a/artwork/3D Model/boards/OPGPS/TEXTURE.PNG b/artwork/3D Model/boards/OPGPS/TEXTURE.PNG new file mode 100644 index 000000000..23f8c3b14 Binary files /dev/null and b/artwork/3D Model/boards/OPGPS/TEXTURE.PNG differ diff --git a/artwork/3D Model/boards/OPLink/OPLink.3DS b/artwork/3D Model/boards/OPLink/OPLink.3DS new file mode 100644 index 000000000..cfe56f1c4 Binary files /dev/null and b/artwork/3D Model/boards/OPLink/OPLink.3DS differ diff --git a/artwork/3D Model/boards/OPLink/OPLink.jpg b/artwork/3D Model/boards/OPLink/OPLink.jpg new file mode 100644 index 000000000..e5b1aac6d Binary files /dev/null and b/artwork/3D Model/boards/OPLink/OPLink.jpg differ diff --git a/artwork/3D Model/boards/OPLink/TEXTURE.PNG b/artwork/3D Model/boards/OPLink/TEXTURE.PNG new file mode 100644 index 000000000..ee659614d Binary files /dev/null and b/artwork/3D Model/boards/OPLink/TEXTURE.PNG differ diff --git a/artwork/3D Model/boards/Revolution/Revolution.3DS b/artwork/3D Model/boards/Revolution/Revolution.3DS new file mode 100644 index 000000000..58cfe8d6d Binary files /dev/null and b/artwork/3D Model/boards/Revolution/Revolution.3DS differ diff --git a/artwork/3D Model/boards/Revolution/Revolution.jpg b/artwork/3D Model/boards/Revolution/Revolution.jpg new file mode 100644 index 000000000..8d55053b0 Binary files /dev/null and b/artwork/3D Model/boards/Revolution/Revolution.jpg differ diff --git a/artwork/3D Model/boards/Revolution/TEXTURE.PNG b/artwork/3D Model/boards/Revolution/TEXTURE.PNG new file mode 100644 index 000000000..cfc4d7f6a Binary files /dev/null and b/artwork/3D Model/boards/Revolution/TEXTURE.PNG differ diff --git a/artwork/3D Model/multi/joes_cnc/CC.PNG b/artwork/3D Model/multi/joes_cnc/CC.PNG deleted file mode 100644 index 467f34a97..000000000 Binary files a/artwork/3D Model/multi/joes_cnc/CC.PNG and /dev/null differ diff --git a/artwork/3D Model/multi/joes_cnc/J14-QT_+.3DS b/artwork/3D Model/multi/joes_cnc/J14-QT_+.3DS index 1879b07c6..9d0d2de8c 100644 Binary files a/artwork/3D Model/multi/joes_cnc/J14-QT_+.3DS and b/artwork/3D Model/multi/joes_cnc/J14-QT_+.3DS differ diff --git a/artwork/3D Model/multi/joes_cnc/J14-QT_X.3DS b/artwork/3D Model/multi/joes_cnc/J14-QT_X.3DS index f26dacb45..a29de2543 100644 Binary files a/artwork/3D Model/multi/joes_cnc/J14-QT_X.3DS and b/artwork/3D Model/multi/joes_cnc/J14-QT_X.3DS differ diff --git a/artwork/3D Model/multi/joes_cnc/J14-Q_+.3DS b/artwork/3D Model/multi/joes_cnc/J14-Q_+.3DS index 21fbccf01..d4bb3dfbf 100644 Binary files a/artwork/3D Model/multi/joes_cnc/J14-Q_+.3DS and b/artwork/3D Model/multi/joes_cnc/J14-Q_+.3DS differ diff --git a/artwork/3D Model/multi/joes_cnc/J14-Q_X.3DS b/artwork/3D Model/multi/joes_cnc/J14-Q_X.3DS index 529e60fac..cb0f3e995 100644 Binary files a/artwork/3D Model/multi/joes_cnc/J14-Q_X.3DS and b/artwork/3D Model/multi/joes_cnc/J14-Q_X.3DS differ diff --git a/artwork/3D Model/multi/joes_cnc/TEXTURE.JPG b/artwork/3D Model/multi/joes_cnc/TEXTURE.JPG new file mode 100644 index 000000000..9e5500340 Binary files /dev/null and b/artwork/3D Model/multi/joes_cnc/TEXTURE.JPG differ diff --git a/artwork/3D Model/multi/joes_cnc/TEXTURE.PNG b/artwork/3D Model/multi/joes_cnc/TEXTURE.PNG deleted file mode 100644 index 5d26bb120..000000000 Binary files a/artwork/3D Model/multi/joes_cnc/TEXTURE.PNG and /dev/null differ diff --git a/artwork/PFD/pfd.svg b/artwork/PFD/pfd.svg index 6313bf1df..abdc4f8c5 100755 --- a/artwork/PFD/pfd.svg +++ b/artwork/PFD/pfd.svg @@ -14,12 +14,12 @@ height="707.56323" id="svg2" version="1.1" - inkscape:version="0.48.1 " - sodipodi:docname="pfd.svg" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="pfd-11.svg" style="display:inline" - inkscape:export-filename="H:\Documents\Hobbies\OpenPilot\SVN\artwork\PFD-2.png" - inkscape:export-xdpi="269.53" - inkscape:export-ydpi="269.53"> + inkscape:export-filename="C:\Users\Nuno\Desktop\OpenPilot\PFD\PFD-4.png" + inkscape:export-xdpi="71.993568" + inkscape:export-ydpi="71.993568"> + + + + + + + + @@ -1696,7 +1728,7 @@ + transform="matrix(4.6362185,0,0,1.9084264,-1475.4746,-363.49767)" + id="world-bg" + inkscape:label="#g4280"> + id="ground" + style="fill:url(#linearGradient5597);fill-opacity:1;stroke:none" + inkscape:label="#rect3724" /> + rx="2.7755576e-017" + inkscape:label="#rect2942" /> - 10 - 10 - - - - - 20 - 20 - - - - - -10 - -10 - - - - - - - - - - - - - - - - - - - -20 - -20 - - + style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:label="#path3808" /> + + + 10 + + + 10 + + + 20 + + + 20 + + + -10 + + + -10 + + + -20 + + + -20 + + + + + + + + + + + + + + + transform="translate(230.4171,-2.5493479)" + sodipodi:insensitive="true"> @@ -2102,8 +2051,8 @@ @@ -2278,13 +2227,370 @@ x1="460.75775" style="fill:none;stroke:#ffffff;stroke-width:2.61937094;display:inline" /> + SPD + + ALT + m/s + m + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + 1 + 2 + 1 + + + + ft/s + VSI + + + + + - diff --git a/ground/openpilotgcs/share/openpilotgcs/models/boards/Revolution/Revolution.3DS b/ground/openpilotgcs/share/openpilotgcs/models/boards/Revolution/Revolution.3DS new file mode 100644 index 000000000..58cfe8d6d Binary files /dev/null and b/ground/openpilotgcs/share/openpilotgcs/models/boards/Revolution/Revolution.3DS differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/boards/Revolution/TEXTURE.PNG b/ground/openpilotgcs/share/openpilotgcs/models/boards/Revolution/TEXTURE.PNG new file mode 100644 index 000000000..cfc4d7f6a Binary files /dev/null and b/ground/openpilotgcs/share/openpilotgcs/models/boards/Revolution/TEXTURE.PNG differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/CC.PNG b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/CC.PNG deleted file mode 100644 index 467f34a97..000000000 Binary files a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/CC.PNG and /dev/null differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-QT_+.3DS b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-QT_+.3DS old mode 100644 new mode 100755 index 1879b07c6..9d0d2de8c Binary files a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-QT_+.3DS and b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-QT_+.3DS differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-QT_X.3DS b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-QT_X.3DS old mode 100644 new mode 100755 index f26dacb45..a29de2543 Binary files a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-QT_X.3DS and b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-QT_X.3DS differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-Q_+.3DS b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-Q_+.3DS old mode 100644 new mode 100755 index 21fbccf01..d4bb3dfbf Binary files a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-Q_+.3DS and b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-Q_+.3DS differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-Q_X.3DS b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-Q_X.3DS old mode 100644 new mode 100755 index 529e60fac..cb0f3e995 Binary files a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-Q_X.3DS and b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/J14-Q_X.3DS differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/TEXTURE.JPG b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/TEXTURE.JPG new file mode 100644 index 000000000..9e5500340 Binary files /dev/null and b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/TEXTURE.JPG differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/TEXTURE.PNG b/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/TEXTURE.PNG deleted file mode 100644 index 5d26bb120..000000000 Binary files a/ground/openpilotgcs/share/openpilotgcs/models/multi/joes_cnc/TEXTURE.PNG and /dev/null differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/texture.jpg b/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/texture.jpg new file mode 100755 index 000000000..2d1722d91 Binary files /dev/null and b/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/texture.jpg differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/zagi.3ds b/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/zagi.3ds new file mode 100755 index 000000000..232cdef5d Binary files /dev/null and b/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/zagi.3ds differ diff --git a/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/zagi.jpg b/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/zagi.jpg new file mode 100755 index 000000000..18d592291 Binary files /dev/null and b/ground/openpilotgcs/share/openpilotgcs/models/planes/zagi/zagi.jpg differ diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index 2fb70210c..abdc4f8c5 100755 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -15,7 +15,7 @@ id="svg2" version="1.1" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="pfd-6.svg" + sodipodi:docname="pfd-11.svg" style="display:inline" inkscape:export-filename="C:\Users\Nuno\Desktop\OpenPilot\PFD\PFD-4.png" inkscape:export-xdpi="71.993568" @@ -1615,14 +1615,14 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="568.94653" - inkscape:cy="247.78161" + inkscape:zoom="1.1617336" + inkscape:cx="415.72223" + inkscape:cy="353.78162" inkscape:document-units="px" - inkscape:current-layer="layer41" + inkscape:current-layer="svg2" showgrid="false" - inkscape:window-width="1680" - inkscape:window-height="987" + inkscape:window-width="1920" + inkscape:window-height="1017" inkscape:window-x="-4" inkscape:window-y="-4" inkscape:window-maximized="1" @@ -1721,7 +1721,7 @@ image/svg+xml - + @@ -2227,6 +2227,66 @@ x1="460.75775" style="fill:none;stroke:#ffffff;stroke-width:2.61937094;display:inline" /> + SPD + + ALT + m/s + m + style="display:inline" + sodipodi:insensitive="true"> + inkscape:label="vsi-window" + style="display:inline" + sodipodi:insensitive="true"> 1 + + + ft/s + VSI + + + id="g10197" + transform="translate(62,-40)"> 1250m