From c79cc1eb1a6bf4afd3dba65c0b010c2119875e08 Mon Sep 17 00:00:00 2001 From: elafargue Date: Thu, 9 Jun 2011 18:03:19 +0200 Subject: [PATCH 1/5] OP-376 Make all dialogs more dynamic to cope with smaller screens & resizes. --- .../lineardial/lineardialgadgetoptionspage.ui | 1053 ++++++++--------- .../src/plugins/pfd/pfdgadgetoptionspage.ui | 220 ++-- .../plugins/scope/scopegadgetoptionspage.cpp | 2 +- .../plugins/scope/scopegadgetoptionspage.ui | 644 +++++----- 4 files changed, 917 insertions(+), 1002 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetoptionspage.ui b/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetoptionspage.ui index 1d94b3cf4..9bf5c93e0 100644 --- a/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetoptionspage.ui +++ b/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetoptionspage.ui @@ -1,546 +1,507 @@ - - - LineardialGadgetOptionsPage - - - - 0 - 0 - 540 - 347 - - - - - 0 - 0 - - - - Form - - - - - -1 - -1 - 533 - 321 - - - - - QLayout::SetMinimumSize - - - 10 - - - 5 - - - 10 - - - 10 - - - - - - - Use OpenGL - - - true - - - - - - - - - Qt::Horizontal - - - - - - - 10 - - - QLayout::SetMaximumSize - - - 10 - - - - - Dial SVG: - - - - - - - - 0 - 0 - - - - - - - - - - - - - 0 - 0 - - - - Whole range: - - - - - - - Min: - - - - - - - - 0 - 0 - - - - 3 - - - -99999.000000000000000 - - - 99999.990000000005239 - - - - - - - Max: - - - - - - - - 0 - 0 - - - - 3 - - - -99999.000000000000000 - - - 99999.990000000005239 - - - - - - - - - Qt::Horizontal - - - - - - - - - - 0 - 0 - - - - Green: - - - - - - - Min: - - - - - - - - 0 - 0 - - - - 3 - - - -99999.000000000000000 - - - 99999.990000000005239 - - - - - - - Max: - - - - - - - - 0 - 0 - - - - 3 - - - -99999.000000000000000 - - - 99999.990000000005239 - - - - - - - - - Qt::Horizontal - - - - - - - - - - 0 - 0 - - - - Yellow: - - - - - - - Min: - - - - - - - - 0 - 0 - - - - 3 - - - -99999.000000000000000 - - - 99999.990000000005239 - - - - - - - Max: - - - - - - - - 0 - 0 - - - - 3 - - - -99999.000000000000000 - - - 99999.990000000005239 - - - - - - - - - Qt::Horizontal - - - - - - - - - - 0 - 0 - - - - Red: - - - - - - - Min: - - - - - - - - 0 - 0 - - - - 3 - - - -99999.000000000000000 - - - 99999.990000000005239 - - - - - - - Max: - - - - - - - - 0 - 0 - - - - 3 - - - -99999.000000000000000 - - - 99999.990000000005239 - - - - - - - - - - - - 0 - 0 - - - - Input: - - - - - - - ObjectName - - - - - - - - 0 - 0 - - - - - - - - ObjectField - - - - - - - - 0 - 0 - - - - - - - - - - 0 - - - - - - 0 - 0 - - - - Dial font: - - - - - - - Select... - - - - - - - Decimal places: - - - - - - - 99 - - - - - - - Factor: - - - - - - - 6 - - - -10000.000000000000000 - - - 100000.000000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Utils::PathChooser - QWidget -
utils/pathchooser.h
- 1 - - - - - + + + LineardialGadgetOptionsPage + + + + 0 + 0 + 540 + 347 + + + + + 0 + 0 + + + + Form + + + + + + + + Use OpenGL + + + true + + + + + + + + + Qt::Horizontal + + + + + + + 10 + + + QLayout::SetMaximumSize + + + 10 + + + + + Dial SVG: + + + + + + + + 0 + 0 + + + + + + + + + + + + + 0 + 0 + + + + Whole range: + + + + + + + Min: + + + + + + + + 0 + 0 + + + + 3 + + + -99999.000000000000000 + + + 99999.990000000005239 + + + + + + + Max: + + + + + + + + 0 + 0 + + + + 3 + + + -99999.000000000000000 + + + 99999.990000000005239 + + + + + + + + + Qt::Horizontal + + + + + + + + + + 0 + 0 + + + + Green: + + + + + + + Min: + + + + + + + + 0 + 0 + + + + 3 + + + -99999.000000000000000 + + + 99999.990000000005239 + + + + + + + Max: + + + + + + + + 0 + 0 + + + + 3 + + + -99999.000000000000000 + + + 99999.990000000005239 + + + + + + + + + + + + 0 + 0 + + + + Yellow: + + + + + + + Min: + + + + + + + + 0 + 0 + + + + 3 + + + -99999.000000000000000 + + + 99999.990000000005239 + + + + + + + Max: + + + + + + + + 0 + 0 + + + + 3 + + + -99999.000000000000000 + + + 99999.990000000005239 + + + + + + + + + + + + 0 + 0 + + + + Red: + + + + + + + Min: + + + + + + + + 0 + 0 + + + + 3 + + + -99999.000000000000000 + + + 99999.990000000005239 + + + + + + + Max: + + + + + + + + 0 + 0 + + + + 3 + + + -99999.000000000000000 + + + 99999.990000000005239 + + + + + + + + + + + + 0 + 0 + + + + Input: + + + + + + + ObjectName + + + + + + + + 0 + 0 + + + + + + + + ObjectField + + + + + + + + 0 + 0 + + + + + + + + + + 0 + + + + + + 0 + 0 + + + + Dial font: + + + + + + + Select... + + + + + + + Decimal places: + + + + + + + 99 + + + + + + + Factor: + + + + + + + 6 + + + -10000.000000000000000 + + + 100000.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Utils::PathChooser + QWidget +
utils/pathchooser.h
+ 1 + + + + + diff --git a/ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.ui b/ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.ui index 4086d1a5a..f9a2808b3 100644 --- a/ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.ui +++ b/ground/openpilotgcs/src/plugins/pfd/pfdgadgetoptionspage.ui @@ -7,7 +7,7 @@ 0 0 529 - 346 + 271 @@ -19,131 +19,99 @@ Form - - - - -1 - -1 - 504 - 331 - - - - - QLayout::SetMinimumSize - - - 10 - - - 5 - - - 10 - - - 10 - - - - - 10 - - - QLayout::SetMaximumSize - - - 10 - - - - - PFD SVG: - - - - - - - - 0 - 0 - - - - - - - - - - Qt::Horizontal - - - - - - - - - true - - - Use OpenGL for rendering - - - true - - - - - - - High Quality text (OpenGL) - - - - - - - - - - - Smooth updates - - - true - - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - - - + + + + + 10 + + + QLayout::SetMaximumSize + + + 10 + + + + + PFD SVG: + + + + + + + + 0 + 0 + + + + + + + + + + Qt::Horizontal + + + + + + + + + true + + + Use OpenGL for rendering + + + true + + + + + + + High Quality text (OpenGL) + + + + + + + + + + + Smooth updates + + + true + + + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 40 + + + + + diff --git a/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp b/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp index 6dc549ba1..e44ccb08f 100644 --- a/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp +++ b/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.cpp @@ -132,7 +132,7 @@ QWidget* ScopeGadgetOptionsPage::createPage(QWidget *parent) void ScopeGadgetOptionsPage::on_btnColor_clicked() { - QColor color = QColorDialog::getColor( QColor(options_page->btnColor->text()), options_page->widget); + QColor color = QColorDialog::getColor( QColor(options_page->btnColor->text())); if (color.isValid()) { setButtonColor(color); } diff --git a/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui b/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui index 4ba44b242..2aaee1942 100644 --- a/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui +++ b/ground/openpilotgcs/src/plugins/scope/scopegadgetoptionspage.ui @@ -1,329 +1,315 @@ - - - ScopeGadgetOptionsPage - - - - 0 - 0 - 550 - 290 - - - - Form - - - - - 10 - 10 - 541 - 271 - - - - - - 0 - 0 - 531 - 272 - - - - - 3 - - - - - QLayout::SetDefaultConstraint - - - - - QFormLayout::AllNonFixedFieldsGrow - - - - - - Bitstream Charter - 75 - true - - - - X-Axis - - - - - - - Plot Type: - - - - - - - - - - Data Size: - - - - - - - seconds - - - 5000 - - - 30 - - - 300 - - - - - - - Update Interval: - - - - - - - ms - - - 10 - - - 30000 - - - 500 - - - 1000 - - - - - - - - Bitstream Charter - 75 - true - - - - Plot curves - - - - - - - UAVObject: - - - - - - - - - - UAVField: - - - - - - - - - - Color: - - - - - - - Choose - - - - - - - Scale: - - - - - - - false - - - - - - - - - QLayout::SetFixedSize - - - - - Qt::Vertical - - - - 20 - 100 - - - - - - - - Add a new curve to the scope, or update it if the UAVObject and UAVField is the same. - - - Add -Update - - - - - - - Remove the curve from the scope. - - - Remove - - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 15 - - - - - - - - - - - - Qt::Vertical - - - - 0 - 200 - - - - - - - - QAbstractItemView::SelectItems - - - 100 - - - - - - - - - - - - - - - - - Log data to csv file - - - - - - - New file on connect - - - - - - - - - Logging path - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - Utils::PathChooser - QWidget -
utils/pathchooser.h
- 1 - - - - - + + + ScopeGadgetOptionsPage + + + + 0 + 0 + 550 + 405 + + + + Form + + + + + + QLayout::SetDefaultConstraint + + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + + Bitstream Charter + 75 + true + + + + X-Axis + + + + + + + Plot Type: + + + + + + + + + + Data Size: + + + + + + + seconds + + + 5000 + + + 30 + + + 300 + + + + + + + Update Interval: + + + + + + + ms + + + 10 + + + 30000 + + + 500 + + + 1000 + + + + + + + + Bitstream Charter + 75 + true + + + + Plot curves + + + + + + + UAVObject: + + + + + + + + + + UAVField: + + + + + + + + + + Color: + + + + + + + Choose + + + + + + + Scale: + + + + + + + false + + + + + + + + + QLayout::SetFixedSize + + + + + Qt::Vertical + + + + 20 + 100 + + + + + + + + Add a new curve to the scope, or update it if the UAVObject and UAVField is the same. + + + Add +Update + + + + + + + Remove the curve from the scope. + + + Remove + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 15 + + + + + + + + + + + + Qt::Vertical + + + + 0 + 200 + + + + + + + + QAbstractItemView::SelectItems + + + 100 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Log data to csv file + + + + + + + New file on connect + + + + + + + + + Logging path + + + + + + + + 0 + 0 + + + + + + + + + + + Utils::PathChooser + QWidget +
utils/pathchooser.h
+ 1 + + + + + From 314f59694025f0e0ca8534757e4ddeb21f588263 Mon Sep 17 00:00:00 2001 From: dankers Date: Fri, 10 Jun 2011 21:40:30 +1000 Subject: [PATCH 2/5] Update to Ed's PFD from London Flyer, adds slight look and feel improvments and removes the orange look. Uses some look and feel from Guy's work also. --- artwork/PFD/pfd.svg | 2199 +++++++++++------ .../share/openpilotgcs/pfd/default/pfd.svg | 2199 +++++++++++------ 2 files changed, 2910 insertions(+), 1488 deletions(-) diff --git a/artwork/PFD/pfd.svg b/artwork/PFD/pfd.svg index a5daa9575..9a732388f 100755 --- a/artwork/PFD/pfd.svg +++ b/artwork/PFD/pfd.svg @@ -14,7 +14,7 @@ height="707.56323" id="svg2" version="1.1" - inkscape:version="0.47 r22583" + inkscape:version="0.48.1 " sodipodi:docname="pfd.svg" style="display:inline" inkscape:export-filename="H:\Documents\Hobbies\OpenPilot\SVN\artwork\PFD-2.png" @@ -1561,6 +1561,52 @@ inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> + + + + + + + - - - - - - - - - - - - - - 20 - 20 - - - - 10 - 10 - - - - 10 - 10 - - - - 20 - 20 - + transform="matrix(4.6362185,0,0,1.5267412,-1475.4746,-169.05952)" + id="g4280"> + + + + 10 + 10 + + + + + 20 + 20 + + + + + -10 + -10 + + + + + + + + + + + + + + + + + + + -20 + -20 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2094,141 +2075,598 @@ id="tspan4328" sodipodi:role="line">GPS - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + inkscape:label="#g5089"> + id="angle-3"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + id="g7953"> + + + + + + + + + + + + + + + + + + + + inkscape:label="#path3779-1" + inkscape:connector-curvature="0" /> + inkscape:label="#path3779-7" + inkscape:connector-curvature="0" /> + id="path4216" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.06858087;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + inkscape:connector-curvature="0" /> + d="m 280.28409,30.123177 5.7832,0 7.54688,11.08789 0,-11.08789 5.83789,0 0,20.042968 -5.83789,0 -7.50586,-11.005859 0,11.005859 -5.82422,0 z" + inkscape:connector-curvature="0" /> + id="path6986" + inkscape:connector-curvature="0" /> + d="m -217.0715,43.535286 5.89258,-0.369141 c 0.12759,0.957038 0.38736,1.686204 0.77929,2.1875 0.63801,0.811202 1.54947,1.216801 2.73438,1.216797 0.8841,4e-6 1.56542,-0.207353 2.04394,-0.62207 0.47851,-0.414709 0.71776,-0.895503 0.71778,-1.442383 -2e-5,-0.519525 -0.22788,-0.984368 -0.6836,-1.394531 -0.45574,-0.410149 -1.51303,-0.797518 -3.17187,-1.16211 -2.71616,-0.610668 -4.653,-1.421865 -5.81055,-2.433593 -1.16667,-1.011707 -1.75,-2.30142 -1.75,-3.869141 0,-1.029932 0.2985,-2.002913 0.89551,-2.918945 0.597,-0.915998 1.49479,-1.636049 2.69336,-2.160156 1.19856,-0.524069 2.84146,-0.786113 4.92871,-0.786133 2.56118,2e-5 4.51398,0.476257 5.8584,1.428711 1.34438,0.952492 2.14418,2.46779 2.39941,4.545898 l -5.83789,0.341797 c -0.15496,-0.902329 -0.48081,-1.558578 -0.97754,-1.96875 -0.49675,-0.41014 -1.18263,-0.615218 -2.05762,-0.615234 -0.72006,1.6e-5 -1.26237,0.152685 -1.62695,0.458007 -0.36459,0.305355 -0.54688,0.676774 -0.54687,1.114258 -1e-5,0.319025 0.15038,0.606134 0.45117,0.861328 0.29166,0.264337 0.98436,0.510431 2.07812,0.738282 2.70702,0.583346 4.64615,1.173514 5.81739,1.770507 1.1712,0.597017 2.02342,1.337576 2.55664,2.22168 0.53318,0.884123 0.79978,1.873055 0.7998,2.966797 -2e-5,1.285161 -0.35549,2.470056 -1.06641,3.554687 -0.71095,1.084638 -1.70444,1.907228 -2.98046,2.467774 -1.27606,0.560547 -2.88478,0.84082 -4.82618,0.84082 -3.40886,0 -5.76953,-0.656249 -7.08203,-1.96875 -1.3125,-1.312497 -2.05534,-2.980464 -2.22851,-5.003906 z" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + d="m 778.62402,43.535286 5.89258,-0.369141 c 0.1276,0.957038 0.38736,1.686204 0.7793,2.1875 0.63801,0.811202 1.54947,1.216801 2.73437,1.216797 0.88411,4e-6 1.56542,-0.207353 2.04395,-0.62207 0.4785,-0.414709 0.71776,-0.895503 0.71777,-1.442383 -1e-5,-0.519525 -0.22788,-0.984368 -0.68359,-1.394531 -0.45574,-0.410149 -1.51303,-0.797518 -3.17188,-1.16211 -2.71615,-0.610668 -4.653,-1.421865 -5.81054,-2.433593 -1.16667,-1.011707 -1.75001,-2.30142 -1.75,-3.869141 -10e-6,-1.029932 0.2985,-2.002913 0.8955,-2.918945 0.59701,-0.915998 1.49479,-1.636049 2.69336,-2.160156 1.19856,-0.524069 2.84147,-0.786113 4.92871,-0.786133 2.56119,2e-5 4.51399,0.476257 5.8584,1.428711 1.34439,0.952492 2.14419,2.46779 2.39942,4.545898 l -5.83789,0.341797 c -0.15496,-0.902329 -0.48081,-1.558578 -0.97754,-1.96875 -0.49676,-0.41014 -1.18263,-0.615218 -2.05762,-0.615234 -0.72006,1.6e-5 -1.26238,0.152685 -1.62695,0.458007 -0.36459,0.305355 -0.54689,0.676774 -0.54688,1.114258 -1e-5,0.319025 0.15039,0.606134 0.45117,0.861328 0.29166,0.264337 0.98437,0.510431 2.07813,0.738282 2.70702,0.583346 4.64614,1.173514 5.81738,1.770507 1.17121,0.597017 2.02342,1.337576 2.55664,2.22168 0.53319,0.884123 0.79979,1.873055 0.79981,2.966797 -2e-5,1.285161 -0.35549,2.470056 -1.06641,3.554687 -0.71095,1.084638 -1.70444,1.907228 -2.98047,2.467774 -1.27605,0.560547 -2.88478,0.84082 -4.82617,0.84082 -3.40886,0 -5.76954,-0.656249 -7.08203,-1.96875 -1.3125,-1.312497 -2.05534,-2.980464 -2.22852,-5.003906 z" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + d="m 26.930511,30.123177 5.878907,0 2.11914,11.197265 3.089844,-11.197265 5.865234,0 3.103516,11.197265 2.119141,-11.197265 5.851562,0 -4.416015,20.042968 -6.070313,0 -3.513672,-12.61914 -3.5,12.61914 -6.070312,0 z" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + d="m 530.34277,30.123177 16.59766,0 0,4.279296 -10.39063,0 0,3.185547 9.63868,0 0,4.087891 -9.63868,0 0,3.951172 10.69141,0 0,4.539062 -16.89844,0 z" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3048" + inkscape:connector-curvature="0" /> + id="path3651" + inkscape:connector-curvature="0" /> + id="path3653" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3656" + inkscape:connector-curvature="0" /> + id="path3658" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3661" + inkscape:connector-curvature="0" /> + id="path3663" + inkscape:connector-curvature="0" /> + id="path3056" + inkscape:connector-curvature="0" /> + id="path3666" + inkscape:connector-curvature="0" /> + id="path3668" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3671" + inkscape:connector-curvature="0" /> + id="path3673" + inkscape:connector-curvature="0" /> + id="path3060" + inkscape:connector-curvature="0" /> + id="path3676" + inkscape:connector-curvature="0" /> + id="path3678" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3681" + inkscape:connector-curvature="0" /> + id="path3683" + inkscape:connector-curvature="0" /> + id="path3685" + inkscape:connector-curvature="0" /> + id="path3924" + inkscape:connector-curvature="0" /> + id="path3688" + inkscape:connector-curvature="0" /> + id="path3690" + inkscape:connector-curvature="0" /> + id="path3692" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3695" + inkscape:connector-curvature="0" /> + id="path3697" + inkscape:connector-curvature="0" /> + id="path3699" + inkscape:connector-curvature="0" /> + id="path3940" + inkscape:connector-curvature="0" /> + id="path3702" + inkscape:connector-curvature="0" /> + id="path3704" + inkscape:connector-curvature="0" /> + id="path3706" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3709" + inkscape:connector-curvature="0" /> + id="path3711" + inkscape:connector-curvature="0" /> + id="path3713" + inkscape:connector-curvature="0" /> + id="path3956" + inkscape:connector-curvature="0" /> + id="path3716" + inkscape:connector-curvature="0" /> + id="path3718" + inkscape:connector-curvature="0" /> + id="path3720" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3723" + inkscape:connector-curvature="0" /> + id="path3725" + inkscape:connector-curvature="0" /> + id="path3727" + inkscape:connector-curvature="0" /> + id="path3972" + inkscape:connector-curvature="0" /> + id="path3730" + inkscape:connector-curvature="0" /> + id="path3732" + inkscape:connector-curvature="0" /> + id="path3734" + inkscape:connector-curvature="0" /> + id="path4052" + inkscape:connector-curvature="0" /> + id="path3737" + inkscape:connector-curvature="0" /> + id="path3739" + inkscape:connector-curvature="0" /> + id="path3741" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3744" + inkscape:connector-curvature="0" /> + id="path3746" + inkscape:connector-curvature="0" /> + id="path3748" + inkscape:connector-curvature="0" /> + id="path4068" + inkscape:connector-curvature="0" /> + id="path3751" + inkscape:connector-curvature="0" /> + id="path3753" + inkscape:connector-curvature="0" /> + id="path3755" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3758" + inkscape:connector-curvature="0" /> + id="path3760" + inkscape:connector-curvature="0" /> + id="path3762" + inkscape:connector-curvature="0" /> + id="path4084" + inkscape:connector-curvature="0" /> + id="path3765" + inkscape:connector-curvature="0" /> + id="path3767" + inkscape:connector-curvature="0" /> + id="path3769" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3772" + inkscape:connector-curvature="0" /> + id="path3774" + inkscape:connector-curvature="0" /> + id="path3776" + inkscape:connector-curvature="0" /> + id="path4100" + inkscape:connector-curvature="0" /> + id="path3780" + inkscape:connector-curvature="0" /> + id="path3782" + inkscape:connector-curvature="0" /> + id="path3784" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3787" + inkscape:connector-curvature="0" /> + id="path3789" + inkscape:connector-curvature="0" /> + id="path3791" + inkscape:connector-curvature="0" /> + id="path4116" + inkscape:connector-curvature="0" /> + id="path3794" + inkscape:connector-curvature="0" /> + id="path3796" + inkscape:connector-curvature="0" /> + id="path3798" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3801" + inkscape:connector-curvature="0" /> + id="path3803" + inkscape:connector-curvature="0" /> + id="path3805" + inkscape:connector-curvature="0" /> + id="path4228" + inkscape:connector-curvature="0" /> + id="path3809" + inkscape:connector-curvature="0" /> + id="path3811" + inkscape:connector-curvature="0" /> + id="path3813" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3816" + inkscape:connector-curvature="0" /> + id="path3818" + inkscape:connector-curvature="0" /> + id="path3820" + inkscape:connector-curvature="0" /> + id="path4244" + inkscape:connector-curvature="0" /> + id="path3823" + inkscape:connector-curvature="0" /> + id="path3825" + inkscape:connector-curvature="0" /> + id="path3827" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3830" + inkscape:connector-curvature="0" /> + id="path3832" + inkscape:connector-curvature="0" /> + id="path3834" + inkscape:connector-curvature="0" /> + id="path4260" + inkscape:connector-curvature="0" /> + id="path3837" + inkscape:connector-curvature="0" /> + id="path3839" + inkscape:connector-curvature="0" /> + id="path3841" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3844" + inkscape:connector-curvature="0" /> + id="path3846" + inkscape:connector-curvature="0" /> + id="path3848" + inkscape:connector-curvature="0" /> + id="path3306" + inkscape:connector-curvature="0" /> + id="path3851" + inkscape:connector-curvature="0" /> + id="path3853" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3856" + inkscape:connector-curvature="0" /> + id="path3858" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + inkscape:connector-curvature="0" /> + id="path4116-9" + inkscape:connector-curvature="0" /> + id="path3794-8" + inkscape:connector-curvature="0" /> + id="path3796-8" + inkscape:connector-curvature="0" /> + id="path3798-2" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3801-1" + inkscape:connector-curvature="0" /> + id="path3803-7" + inkscape:connector-curvature="0" /> + id="path3805-1" + inkscape:connector-curvature="0" /> + id="path4228-5" + inkscape:connector-curvature="0" /> + id="path3809-7" + inkscape:connector-curvature="0" /> + id="path3811-6" + inkscape:connector-curvature="0" /> + id="path3813-1" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3816-2" + inkscape:connector-curvature="0" /> + id="path3818-2" + inkscape:connector-curvature="0" /> + id="path3820-1" + inkscape:connector-curvature="0" /> + id="path4244-8" + inkscape:connector-curvature="0" /> + id="path3823-7" + inkscape:connector-curvature="0" /> + id="path3825-6" + inkscape:connector-curvature="0" /> + id="path3827-1" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3830-7" + inkscape:connector-curvature="0" /> + id="path3832-9" + inkscape:connector-curvature="0" /> + id="path3834-5" + inkscape:connector-curvature="0" /> + id="path4260-3" + inkscape:connector-curvature="0" /> + id="path3837-2" + inkscape:connector-curvature="0" /> + id="path3839-3" + inkscape:connector-curvature="0" /> + id="path3841-3" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3844-3" + inkscape:connector-curvature="0" /> + id="path3846-8" + inkscape:connector-curvature="0" /> + id="path3848-7" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3681-1" + inkscape:connector-curvature="0" /> + id="path3683-9" + inkscape:connector-curvature="0" /> + id="path3685-8" + inkscape:connector-curvature="0" /> + id="path3924-5" + inkscape:connector-curvature="0" /> + id="path3688-2" + inkscape:connector-curvature="0" /> + id="path3690-8" + inkscape:connector-curvature="0" /> + id="path3692-6" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3695-8" + inkscape:connector-curvature="0" /> + id="path3697-6" + inkscape:connector-curvature="0" /> + id="path3699-5" + inkscape:connector-curvature="0" /> + id="path3940-9" + inkscape:connector-curvature="0" /> + id="path3702-0" + inkscape:connector-curvature="0" /> + id="path3704-6" + inkscape:connector-curvature="0" /> + id="path3706-1" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3709-3" + inkscape:connector-curvature="0" /> + id="path3711-4" + inkscape:connector-curvature="0" /> + id="path3713-4" + inkscape:connector-curvature="0" /> + id="path3956-0" + inkscape:connector-curvature="0" /> + id="path3716-6" + inkscape:connector-curvature="0" /> + id="path3718-1" + inkscape:connector-curvature="0" /> + id="path3720-8" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3723-3" + inkscape:connector-curvature="0" /> + id="path3725-7" + inkscape:connector-curvature="0" /> + id="path3727-8" + inkscape:connector-curvature="0" /> + id="path3972-2" + inkscape:connector-curvature="0" /> + id="path3730-1" + inkscape:connector-curvature="0" /> + id="path3732-3" + inkscape:connector-curvature="0" /> + id="path3734-5" + inkscape:connector-curvature="0" /> @@ -3570,7 +4208,8 @@ inkscape:groupmode="layer" id="layer6" inkscape:label="Bottom area" - style="display:inline"> + style="display:none" + sodipodi:insensitive="true"> + id="path10183" + inkscape:connector-curvature="0" /> + id="path10185" + inkscape:connector-curvature="0" /> @@ -3630,19 +4271,22 @@ id="gcstelemetry-Connected" d="m -109.55949,412.40842 0,9.28125 -31.40625,0 0,4.90625 0,0.0937 0,4.90625 31.40625,0 0,9.28125 14.250003,-14.25 -14.250003,-14.21875 z" style="fill:#1c870b;fill-opacity:1;stroke:#113b05;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - inkscape:label="#path7548" /> + inkscape:label="#path7548" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccccccccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cccccccccc" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#1c5313;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#1c5313;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:connector-curvature="0" /> + id="path5044" + inkscape:connector-curvature="0" /> + id="path5046" + inkscape:connector-curvature="0" /> + id="path4035" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4039" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4043" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4061" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4065" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4071" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4075" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4079" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4085" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4089" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4095" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4099" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4103" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4109" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4113" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4119" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5650" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5654" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5658" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5662" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5666" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5670" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5674" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5678" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5682" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5686" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5690" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5694" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5698" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5702" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5706" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> @@ -4020,6 +4730,7 @@ style="fill:#453e3e;fill-opacity:1;stroke:#000000;stroke-width:4.08031273;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -115.54603,-47.690059 c -2.50791,0 -4.54785,1.99743 -4.54785,4.50534 l 0,807.009359 c 0,2.5079 2.03994,4.54785 4.54785,4.54785 l 807.00936,0 c 2.5079,0 4.50534,-2.03995 4.50534,-4.54785 l 0,-807.009359 c 0,-2.50791 -1.99744,-4.50534 -4.50534,-4.50534 l -807.00936,0 z M 289.34,11.395534 c 150.15374,0 271.88009,59.618647 272.02085,133.162706 l 0.21252,48.57516 -0.38253,374.99409 C 556.30557,639.62843 436.47945,673.69951 289.34,673.69951 c -147.13944,0 -266.965544,-34.07108 -271.850832,-105.57202 l -0.212516,0 0,-374.99409 0.0425,-48.58122 C 17.459912,71.008115 139.18627,11.395534 289.34,11.395534 z" id="rect2816" - sodipodi:nodetypes="cccccccccccccsccccc" /> + sodipodi:nodetypes="cccccccccccccsccccc" + inkscape:connector-curvature="0" /> diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg index a5daa9575..9a732388f 100755 --- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg +++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg @@ -14,7 +14,7 @@ height="707.56323" id="svg2" version="1.1" - inkscape:version="0.47 r22583" + inkscape:version="0.48.1 " sodipodi:docname="pfd.svg" style="display:inline" inkscape:export-filename="H:\Documents\Hobbies\OpenPilot\SVN\artwork\PFD-2.png" @@ -1561,6 +1561,52 @@ inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d" /> + + + + + + + - - - - - - - - - - - - - - 20 - 20 - - - - 10 - 10 - - - - 10 - 10 - - - - 20 - 20 - + transform="matrix(4.6362185,0,0,1.5267412,-1475.4746,-169.05952)" + id="g4280"> + + + + 10 + 10 + + + + + 20 + 20 + + + + + -10 + -10 + + + + + + + + + + + + + + + + + + + -20 + -20 + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2094,141 +2075,598 @@ id="tspan4328" sodipodi:role="line">GPS - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + inkscape:label="#g5089"> + id="angle-3"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + id="g7953"> + + + + + + + + + + + + + + + + + + + + inkscape:label="#path3779-1" + inkscape:connector-curvature="0" /> + inkscape:label="#path3779-7" + inkscape:connector-curvature="0" /> + id="path4216" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.06858087;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + inkscape:connector-curvature="0" /> + d="m 280.28409,30.123177 5.7832,0 7.54688,11.08789 0,-11.08789 5.83789,0 0,20.042968 -5.83789,0 -7.50586,-11.005859 0,11.005859 -5.82422,0 z" + inkscape:connector-curvature="0" /> + id="path6986" + inkscape:connector-curvature="0" /> + d="m -217.0715,43.535286 5.89258,-0.369141 c 0.12759,0.957038 0.38736,1.686204 0.77929,2.1875 0.63801,0.811202 1.54947,1.216801 2.73438,1.216797 0.8841,4e-6 1.56542,-0.207353 2.04394,-0.62207 0.47851,-0.414709 0.71776,-0.895503 0.71778,-1.442383 -2e-5,-0.519525 -0.22788,-0.984368 -0.6836,-1.394531 -0.45574,-0.410149 -1.51303,-0.797518 -3.17187,-1.16211 -2.71616,-0.610668 -4.653,-1.421865 -5.81055,-2.433593 -1.16667,-1.011707 -1.75,-2.30142 -1.75,-3.869141 0,-1.029932 0.2985,-2.002913 0.89551,-2.918945 0.597,-0.915998 1.49479,-1.636049 2.69336,-2.160156 1.19856,-0.524069 2.84146,-0.786113 4.92871,-0.786133 2.56118,2e-5 4.51398,0.476257 5.8584,1.428711 1.34438,0.952492 2.14418,2.46779 2.39941,4.545898 l -5.83789,0.341797 c -0.15496,-0.902329 -0.48081,-1.558578 -0.97754,-1.96875 -0.49675,-0.41014 -1.18263,-0.615218 -2.05762,-0.615234 -0.72006,1.6e-5 -1.26237,0.152685 -1.62695,0.458007 -0.36459,0.305355 -0.54688,0.676774 -0.54687,1.114258 -1e-5,0.319025 0.15038,0.606134 0.45117,0.861328 0.29166,0.264337 0.98436,0.510431 2.07812,0.738282 2.70702,0.583346 4.64615,1.173514 5.81739,1.770507 1.1712,0.597017 2.02342,1.337576 2.55664,2.22168 0.53318,0.884123 0.79978,1.873055 0.7998,2.966797 -2e-5,1.285161 -0.35549,2.470056 -1.06641,3.554687 -0.71095,1.084638 -1.70444,1.907228 -2.98046,2.467774 -1.27606,0.560547 -2.88478,0.84082 -4.82618,0.84082 -3.40886,0 -5.76953,-0.656249 -7.08203,-1.96875 -1.3125,-1.312497 -2.05534,-2.980464 -2.22851,-5.003906 z" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + d="m 778.62402,43.535286 5.89258,-0.369141 c 0.1276,0.957038 0.38736,1.686204 0.7793,2.1875 0.63801,0.811202 1.54947,1.216801 2.73437,1.216797 0.88411,4e-6 1.56542,-0.207353 2.04395,-0.62207 0.4785,-0.414709 0.71776,-0.895503 0.71777,-1.442383 -1e-5,-0.519525 -0.22788,-0.984368 -0.68359,-1.394531 -0.45574,-0.410149 -1.51303,-0.797518 -3.17188,-1.16211 -2.71615,-0.610668 -4.653,-1.421865 -5.81054,-2.433593 -1.16667,-1.011707 -1.75001,-2.30142 -1.75,-3.869141 -10e-6,-1.029932 0.2985,-2.002913 0.8955,-2.918945 0.59701,-0.915998 1.49479,-1.636049 2.69336,-2.160156 1.19856,-0.524069 2.84147,-0.786113 4.92871,-0.786133 2.56119,2e-5 4.51399,0.476257 5.8584,1.428711 1.34439,0.952492 2.14419,2.46779 2.39942,4.545898 l -5.83789,0.341797 c -0.15496,-0.902329 -0.48081,-1.558578 -0.97754,-1.96875 -0.49676,-0.41014 -1.18263,-0.615218 -2.05762,-0.615234 -0.72006,1.6e-5 -1.26238,0.152685 -1.62695,0.458007 -0.36459,0.305355 -0.54689,0.676774 -0.54688,1.114258 -1e-5,0.319025 0.15039,0.606134 0.45117,0.861328 0.29166,0.264337 0.98437,0.510431 2.07813,0.738282 2.70702,0.583346 4.64614,1.173514 5.81738,1.770507 1.17121,0.597017 2.02342,1.337576 2.55664,2.22168 0.53319,0.884123 0.79979,1.873055 0.79981,2.966797 -2e-5,1.285161 -0.35549,2.470056 -1.06641,3.554687 -0.71095,1.084638 -1.70444,1.907228 -2.98047,2.467774 -1.27605,0.560547 -2.88478,0.84082 -4.82617,0.84082 -3.40886,0 -5.76954,-0.656249 -7.08203,-1.96875 -1.3125,-1.312497 -2.05534,-2.980464 -2.22852,-5.003906 z" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + d="m 26.930511,30.123177 5.878907,0 2.11914,11.197265 3.089844,-11.197265 5.865234,0 3.103516,11.197265 2.119141,-11.197265 5.851562,0 -4.416015,20.042968 -6.070313,0 -3.513672,-12.61914 -3.5,12.61914 -6.070312,0 z" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + d="m 530.34277,30.123177 16.59766,0 0,4.279296 -10.39063,0 0,3.185547 9.63868,0 0,4.087891 -9.63868,0 0,3.951172 10.69141,0 0,4.539062 -16.89844,0 z" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3048" + inkscape:connector-curvature="0" /> + id="path3651" + inkscape:connector-curvature="0" /> + id="path3653" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3656" + inkscape:connector-curvature="0" /> + id="path3658" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3661" + inkscape:connector-curvature="0" /> + id="path3663" + inkscape:connector-curvature="0" /> + id="path3056" + inkscape:connector-curvature="0" /> + id="path3666" + inkscape:connector-curvature="0" /> + id="path3668" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3671" + inkscape:connector-curvature="0" /> + id="path3673" + inkscape:connector-curvature="0" /> + id="path3060" + inkscape:connector-curvature="0" /> + id="path3676" + inkscape:connector-curvature="0" /> + id="path3678" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3681" + inkscape:connector-curvature="0" /> + id="path3683" + inkscape:connector-curvature="0" /> + id="path3685" + inkscape:connector-curvature="0" /> + id="path3924" + inkscape:connector-curvature="0" /> + id="path3688" + inkscape:connector-curvature="0" /> + id="path3690" + inkscape:connector-curvature="0" /> + id="path3692" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3695" + inkscape:connector-curvature="0" /> + id="path3697" + inkscape:connector-curvature="0" /> + id="path3699" + inkscape:connector-curvature="0" /> + id="path3940" + inkscape:connector-curvature="0" /> + id="path3702" + inkscape:connector-curvature="0" /> + id="path3704" + inkscape:connector-curvature="0" /> + id="path3706" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3709" + inkscape:connector-curvature="0" /> + id="path3711" + inkscape:connector-curvature="0" /> + id="path3713" + inkscape:connector-curvature="0" /> + id="path3956" + inkscape:connector-curvature="0" /> + id="path3716" + inkscape:connector-curvature="0" /> + id="path3718" + inkscape:connector-curvature="0" /> + id="path3720" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3723" + inkscape:connector-curvature="0" /> + id="path3725" + inkscape:connector-curvature="0" /> + id="path3727" + inkscape:connector-curvature="0" /> + id="path3972" + inkscape:connector-curvature="0" /> + id="path3730" + inkscape:connector-curvature="0" /> + id="path3732" + inkscape:connector-curvature="0" /> + id="path3734" + inkscape:connector-curvature="0" /> + id="path4052" + inkscape:connector-curvature="0" /> + id="path3737" + inkscape:connector-curvature="0" /> + id="path3739" + inkscape:connector-curvature="0" /> + id="path3741" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3744" + inkscape:connector-curvature="0" /> + id="path3746" + inkscape:connector-curvature="0" /> + id="path3748" + inkscape:connector-curvature="0" /> + id="path4068" + inkscape:connector-curvature="0" /> + id="path3751" + inkscape:connector-curvature="0" /> + id="path3753" + inkscape:connector-curvature="0" /> + id="path3755" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3758" + inkscape:connector-curvature="0" /> + id="path3760" + inkscape:connector-curvature="0" /> + id="path3762" + inkscape:connector-curvature="0" /> + id="path4084" + inkscape:connector-curvature="0" /> + id="path3765" + inkscape:connector-curvature="0" /> + id="path3767" + inkscape:connector-curvature="0" /> + id="path3769" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3772" + inkscape:connector-curvature="0" /> + id="path3774" + inkscape:connector-curvature="0" /> + id="path3776" + inkscape:connector-curvature="0" /> + id="path4100" + inkscape:connector-curvature="0" /> + id="path3780" + inkscape:connector-curvature="0" /> + id="path3782" + inkscape:connector-curvature="0" /> + id="path3784" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3787" + inkscape:connector-curvature="0" /> + id="path3789" + inkscape:connector-curvature="0" /> + id="path3791" + inkscape:connector-curvature="0" /> + id="path4116" + inkscape:connector-curvature="0" /> + id="path3794" + inkscape:connector-curvature="0" /> + id="path3796" + inkscape:connector-curvature="0" /> + id="path3798" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3801" + inkscape:connector-curvature="0" /> + id="path3803" + inkscape:connector-curvature="0" /> + id="path3805" + inkscape:connector-curvature="0" /> + id="path4228" + inkscape:connector-curvature="0" /> + id="path3809" + inkscape:connector-curvature="0" /> + id="path3811" + inkscape:connector-curvature="0" /> + id="path3813" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3816" + inkscape:connector-curvature="0" /> + id="path3818" + inkscape:connector-curvature="0" /> + id="path3820" + inkscape:connector-curvature="0" /> + id="path4244" + inkscape:connector-curvature="0" /> + id="path3823" + inkscape:connector-curvature="0" /> + id="path3825" + inkscape:connector-curvature="0" /> + id="path3827" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3830" + inkscape:connector-curvature="0" /> + id="path3832" + inkscape:connector-curvature="0" /> + id="path3834" + inkscape:connector-curvature="0" /> + id="path4260" + inkscape:connector-curvature="0" /> + id="path3837" + inkscape:connector-curvature="0" /> + id="path3839" + inkscape:connector-curvature="0" /> + id="path3841" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3844" + inkscape:connector-curvature="0" /> + id="path3846" + inkscape:connector-curvature="0" /> + id="path3848" + inkscape:connector-curvature="0" /> + id="path3306" + inkscape:connector-curvature="0" /> + id="path3851" + inkscape:connector-curvature="0" /> + id="path3853" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3856" + inkscape:connector-curvature="0" /> + id="path3858" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + inkscape:connector-curvature="0" /> + id="path4116-9" + inkscape:connector-curvature="0" /> + id="path3794-8" + inkscape:connector-curvature="0" /> + id="path3796-8" + inkscape:connector-curvature="0" /> + id="path3798-2" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3801-1" + inkscape:connector-curvature="0" /> + id="path3803-7" + inkscape:connector-curvature="0" /> + id="path3805-1" + inkscape:connector-curvature="0" /> + id="path4228-5" + inkscape:connector-curvature="0" /> + id="path3809-7" + inkscape:connector-curvature="0" /> + id="path3811-6" + inkscape:connector-curvature="0" /> + id="path3813-1" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3816-2" + inkscape:connector-curvature="0" /> + id="path3818-2" + inkscape:connector-curvature="0" /> + id="path3820-1" + inkscape:connector-curvature="0" /> + id="path4244-8" + inkscape:connector-curvature="0" /> + id="path3823-7" + inkscape:connector-curvature="0" /> + id="path3825-6" + inkscape:connector-curvature="0" /> + id="path3827-1" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3830-7" + inkscape:connector-curvature="0" /> + id="path3832-9" + inkscape:connector-curvature="0" /> + id="path3834-5" + inkscape:connector-curvature="0" /> + id="path4260-3" + inkscape:connector-curvature="0" /> + id="path3837-2" + inkscape:connector-curvature="0" /> + id="path3839-3" + inkscape:connector-curvature="0" /> + id="path3841-3" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3844-3" + inkscape:connector-curvature="0" /> + id="path3846-8" + inkscape:connector-curvature="0" /> + id="path3848-7" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3681-1" + inkscape:connector-curvature="0" /> + id="path3683-9" + inkscape:connector-curvature="0" /> + id="path3685-8" + inkscape:connector-curvature="0" /> + id="path3924-5" + inkscape:connector-curvature="0" /> + id="path3688-2" + inkscape:connector-curvature="0" /> + id="path3690-8" + inkscape:connector-curvature="0" /> + id="path3692-6" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3695-8" + inkscape:connector-curvature="0" /> + id="path3697-6" + inkscape:connector-curvature="0" /> + id="path3699-5" + inkscape:connector-curvature="0" /> + id="path3940-9" + inkscape:connector-curvature="0" /> + id="path3702-0" + inkscape:connector-curvature="0" /> + id="path3704-6" + inkscape:connector-curvature="0" /> + id="path3706-1" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3709-3" + inkscape:connector-curvature="0" /> + id="path3711-4" + inkscape:connector-curvature="0" /> + id="path3713-4" + inkscape:connector-curvature="0" /> + id="path3956-0" + inkscape:connector-curvature="0" /> + id="path3716-6" + inkscape:connector-curvature="0" /> + id="path3718-1" + inkscape:connector-curvature="0" /> + id="path3720-8" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#fff8f8;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path3723-3" + inkscape:connector-curvature="0" /> + id="path3725-7" + inkscape:connector-curvature="0" /> + id="path3727-8" + inkscape:connector-curvature="0" /> + id="path3972-2" + inkscape:connector-curvature="0" /> + id="path3730-1" + inkscape:connector-curvature="0" /> + id="path3732-3" + inkscape:connector-curvature="0" /> + id="path3734-5" + inkscape:connector-curvature="0" /> @@ -3570,7 +4208,8 @@ inkscape:groupmode="layer" id="layer6" inkscape:label="Bottom area" - style="display:inline"> + style="display:none" + sodipodi:insensitive="true"> + id="path10183" + inkscape:connector-curvature="0" /> + id="path10185" + inkscape:connector-curvature="0" /> @@ -3630,19 +4271,22 @@ id="gcstelemetry-Connected" d="m -109.55949,412.40842 0,9.28125 -31.40625,0 0,4.90625 0,0.0937 0,4.90625 31.40625,0 0,9.28125 14.250003,-14.25 -14.250003,-14.21875 z" style="fill:#1c870b;fill-opacity:1;stroke:#113b05;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - inkscape:label="#path7548" /> + inkscape:label="#path7548" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="ccccccccccccccccc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cccccccccc" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#1c5313;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#1c5313;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + inkscape:connector-curvature="0" /> + id="path5044" + inkscape:connector-curvature="0" /> + id="path5046" + inkscape:connector-curvature="0" /> + id="path4035" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4039" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4043" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4061" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4065" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4071" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4075" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4079" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4085" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4089" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4095" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4099" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4103" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4109" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4113" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path4119" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5650" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5654" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5658" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5662" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5666" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5670" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5674" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5678" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5682" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5686" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5690" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5694" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5698" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5702" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:2.10024118;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + id="path5706" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> @@ -4020,6 +4730,7 @@ style="fill:#453e3e;fill-opacity:1;stroke:#000000;stroke-width:4.08031273;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -115.54603,-47.690059 c -2.50791,0 -4.54785,1.99743 -4.54785,4.50534 l 0,807.009359 c 0,2.5079 2.03994,4.54785 4.54785,4.54785 l 807.00936,0 c 2.5079,0 4.50534,-2.03995 4.50534,-4.54785 l 0,-807.009359 c 0,-2.50791 -1.99744,-4.50534 -4.50534,-4.50534 l -807.00936,0 z M 289.34,11.395534 c 150.15374,0 271.88009,59.618647 272.02085,133.162706 l 0.21252,48.57516 -0.38253,374.99409 C 556.30557,639.62843 436.47945,673.69951 289.34,673.69951 c -147.13944,0 -266.965544,-34.07108 -271.850832,-105.57202 l -0.212516,0 0,-374.99409 0.0425,-48.58122 C 17.459912,71.008115 139.18627,11.395534 289.34,11.395534 z" id="rect2816" - sodipodi:nodetypes="cccccccccccccsccccc" /> + sodipodi:nodetypes="cccccccccccccsccccc" + inkscape:connector-curvature="0" /> From d9607c44d8ad0508e40737fd3c3461197b783c14 Mon Sep 17 00:00:00 2001 From: dankers Date: Fri, 10 Jun 2011 23:51:01 +1000 Subject: [PATCH 3/5] Minor update from London flyer, readability on smaller screens improvement --- artwork/PFD/pfd.svg | 95 ++++++++----------- .../share/openpilotgcs/pfd/default/pfd.svg | 95 ++++++++----------- 2 files changed, 78 insertions(+), 112 deletions(-) diff --git a/artwork/PFD/pfd.svg b/artwork/PFD/pfd.svg index 9a732388f..6313bf1df 100755 --- a/artwork/PFD/pfd.svg +++ b/artwork/PFD/pfd.svg @@ -1616,8 +1616,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.73067675" - inkscape:cx="362.05822" - inkscape:cy="335.39415" + inkscape:cx="305.98471" + inkscape:cy="372.16908" inkscape:document-units="px" inkscape:current-layer="layer3" showgrid="false" @@ -2077,7 +2077,7 @@ + inkscape:label="#g4670"> - - - - + width="110.05586" + height="450" + x="-147.23766" + y="131.33096" /> + - @@ -2693,24 +2680,20 @@ inkscape:connector-curvature="0" /> - - - - + inkscape:label="#g4577"> + + + inkscape:label="#g4670"> - - - - + width="110.05586" + height="450" + x="-147.23766" + y="131.33096" /> + - @@ -2693,24 +2680,20 @@ inkscape:connector-curvature="0" /> - - - - + inkscape:label="#g4577"> + + Date: Fri, 10 Jun 2011 17:16:15 +0200 Subject: [PATCH 4/5] PiOS.posix: ported PiOS_CRC to PiOS.posix to fix compilation error on OpenPilot introduced by new dependency --- flight/OpenPilot/Makefile.posix | 1 + flight/PiOS.posix/pios.h | 1 + flight/PiOS.posix/posix/pios_crc.c | 74 ++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 flight/PiOS.posix/posix/pios_crc.c diff --git a/flight/OpenPilot/Makefile.posix b/flight/OpenPilot/Makefile.posix index 2eff6f933..050323721 100644 --- a/flight/OpenPilot/Makefile.posix +++ b/flight/OpenPilot/Makefile.posix @@ -162,6 +162,7 @@ CFLAGS_UAVOBJECTS = $(UAVOBJDEFINE) endif ## PIOS Hardware (posix) +SRC += $(PIOSPOSIX)/pios_crc.c SRC += $(PIOSPOSIX)/pios_sys.c SRC += $(PIOSPOSIX)/pios_led.c SRC += $(PIOSPOSIX)/pios_delay.c diff --git a/flight/PiOS.posix/pios.h b/flight/PiOS.posix/pios.h index 4f6266aca..a82d13b81 100644 --- a/flight/PiOS.posix/pios.h +++ b/flight/PiOS.posix/pios.h @@ -64,6 +64,7 @@ #include #include #include +#include #define NELEMENTS(x) (sizeof(x) / sizeof(*(x))) diff --git a/flight/PiOS.posix/posix/pios_crc.c b/flight/PiOS.posix/posix/pios_crc.c new file mode 100644 index 000000000..548ba2648 --- /dev/null +++ b/flight/PiOS.posix/posix/pios_crc.c @@ -0,0 +1,74 @@ +/* + * pios_crc.c + * OpenPilotOSX + * + * Created by James Cotton on 6/4/11. + * Copyright 2011 OpenPilot. All rights reserved. + * + */ + +#include "pios.h" + +// CRC lookup table +static const uint8_t crc_table[256] = { + 0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15, 0x38, 0x3f, 0x36, 0x31, 0x24, 0x23, 0x2a, 0x2d, + 0x70, 0x77, 0x7e, 0x79, 0x6c, 0x6b, 0x62, 0x65, 0x48, 0x4f, 0x46, 0x41, 0x54, 0x53, 0x5a, 0x5d, + 0xe0, 0xe7, 0xee, 0xe9, 0xfc, 0xfb, 0xf2, 0xf5, 0xd8, 0xdf, 0xd6, 0xd1, 0xc4, 0xc3, 0xca, 0xcd, + 0x90, 0x97, 0x9e, 0x99, 0x8c, 0x8b, 0x82, 0x85, 0xa8, 0xaf, 0xa6, 0xa1, 0xb4, 0xb3, 0xba, 0xbd, + 0xc7, 0xc0, 0xc9, 0xce, 0xdb, 0xdc, 0xd5, 0xd2, 0xff, 0xf8, 0xf1, 0xf6, 0xe3, 0xe4, 0xed, 0xea, + 0xb7, 0xb0, 0xb9, 0xbe, 0xab, 0xac, 0xa5, 0xa2, 0x8f, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9d, 0x9a, + 0x27, 0x20, 0x29, 0x2e, 0x3b, 0x3c, 0x35, 0x32, 0x1f, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0d, 0x0a, + 0x57, 0x50, 0x59, 0x5e, 0x4b, 0x4c, 0x45, 0x42, 0x6f, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7d, 0x7a, + 0x89, 0x8e, 0x87, 0x80, 0x95, 0x92, 0x9b, 0x9c, 0xb1, 0xb6, 0xbf, 0xb8, 0xad, 0xaa, 0xa3, 0xa4, + 0xf9, 0xfe, 0xf7, 0xf0, 0xe5, 0xe2, 0xeb, 0xec, 0xc1, 0xc6, 0xcf, 0xc8, 0xdd, 0xda, 0xd3, 0xd4, + 0x69, 0x6e, 0x67, 0x60, 0x75, 0x72, 0x7b, 0x7c, 0x51, 0x56, 0x5f, 0x58, 0x4d, 0x4a, 0x43, 0x44, + 0x19, 0x1e, 0x17, 0x10, 0x05, 0x02, 0x0b, 0x0c, 0x21, 0x26, 0x2f, 0x28, 0x3d, 0x3a, 0x33, 0x34, + 0x4e, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5c, 0x5b, 0x76, 0x71, 0x78, 0x7f, 0x6a, 0x6d, 0x64, 0x63, + 0x3e, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2c, 0x2b, 0x06, 0x01, 0x08, 0x0f, 0x1a, 0x1d, 0x14, 0x13, + 0xae, 0xa9, 0xa0, 0xa7, 0xb2, 0xb5, 0xbc, 0xbb, 0x96, 0x91, 0x98, 0x9f, 0x8a, 0x8d, 0x84, 0x83, + 0xde, 0xd9, 0xd0, 0xd7, 0xc2, 0xc5, 0xcc, 0xcb, 0xe6, 0xe1, 0xe8, 0xef, 0xfa, 0xfd, 0xf4, 0xf3 +}; + +/** + * Update the crc value with new data. + * + * Generated by pycrc v0.7.5, http://www.tty1.net/pycrc/ + * using the configuration: + * Width = 8 + * Poly = 0x07 + * XorIn = 0x00 + * ReflectIn = False + * XorOut = 0x00 + * ReflectOut = False + * Algorithm = table-driven + * + * \param crc The current crc value. + * \param data Pointer to a buffer of \a data_len bytes. + * \param length Number of bytes in the \a data buffer. + * \return The updated crc value. + */ +uint8_t PIOS_CRC_updateByte(uint8_t crc, const uint8_t data) +{ + return crc_table[crc ^ data]; +} + +/* + * @brief Update a CRC with a data buffer + * @param[in] crc Starting CRC value + * @param[in] data Data buffer + * @param[in] length Number of bytes to process + * @returns Updated CRC + */ +uint8_t PIOS_CRC_updateCRC(uint8_t crc, const uint8_t* data, int32_t length) +{ + // use registers for speed + register int32_t len = length; + register uint8_t crc8 = crc; + register const uint8_t *p = data; + + while (len--) + crc8 = crc_table[crc8 ^ *p++]; + + return crc8; +} + From a7841a523ae338a9243de81e25c129a5a0e5d03d Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Fri, 10 Jun 2011 22:04:54 +0200 Subject: [PATCH 5/5] bugfix: forgot to add header file (pios.posix) --- flight/PiOS.posix/inc/pios_crc.h | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 flight/PiOS.posix/inc/pios_crc.h diff --git a/flight/PiOS.posix/inc/pios_crc.h b/flight/PiOS.posix/inc/pios_crc.h new file mode 100644 index 000000000..3a64f8bab --- /dev/null +++ b/flight/PiOS.posix/inc/pios_crc.h @@ -0,0 +1,31 @@ +/** + ****************************************************************************** + * @addtogroup PIOS PIOS Core hardware abstraction layer + * @{ + * @addtogroup PIOS_CRC CRC Functions + * @{ + * + * @file pios_crc.h + * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. + * @brief CRC functions header. + * @see The GNU Public License (GPL) Version 3 + * + *****************************************************************************/ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +uint8_t PIOS_CRC_updateByte(uint8_t crc, const uint8_t data); +uint8_t PIOS_CRC_updateCRC(uint8_t crc, const uint8_t* data, int32_t length);