From 337ab6a436ff72ced8647ec39a4261d44ded0a4e Mon Sep 17 00:00:00 2001 From: Fredrik Larson Date: Sat, 23 Aug 2014 23:36:06 +1000 Subject: [PATCH] Add servos to image as we will support single servo --- .../src/libs/sdlgamepad/sdlgamepad.pro.user | 178 +- .../config/images/fixedwing-shapes.svg | 1686 ++++++++++------- 2 files changed, 1052 insertions(+), 812 deletions(-) diff --git a/ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro.user b/ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro.user index 96217e1ea..05764321a 100644 --- a/ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro.user +++ b/ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro.user @@ -1,112 +1,66 @@ - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - System - - - - ProjectExplorer.Project.Target.0 - - Desktop - Qt4ProjectManager.Target.DesktopTarget - 0 - 0 - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /Users/jcotton81/Documents/Programming/OpenPilot/ground/src/plugins/gcscontrol/sdlgamepad-build-desktop - 2 - 0 - true - - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /Users/jcotton81/Documents/Programming/OpenPilot/ground/src/plugins/gcscontrol/sdlgamepad-build-desktop - 2 - 0 - true - - 2 - - - 2 - - false - - - false - $BUILDDIR - Custom Executable - ProjectExplorer.CustomExecutableRunConfiguration - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 4 - - + + + + + + ProjectExplorer.Project.ActiveTarget + -1 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.TargetCount + 0 + + + ProjectExplorer.Project.Updater.EnvironmentId + {6e1a7efe-f107-41f3-9383-31e878c1f556} + + + ProjectExplorer.Project.Updater.FileVersion + 15 + + diff --git a/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg b/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg index 52d8f72b5..cb1cb1c44 100644 --- a/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg +++ b/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg @@ -19,7 +19,7 @@ viewBox="0 0 792 2016" enable-background="new 0 0 792 1008" xml:space="preserve" - inkscape:version="0.48.4 r9939" + inkscape:version="0.48.5 r10040" sodipodi:docname="fixedwing-shapes.svg">image/svg+xml + style="fill:none;stroke:#010101;stroke-width:0.69520003;stroke-linecap:round;stroke-linejoin:round" /> \ No newline at end of file