From b8a3bb19605f57248accfc62a9d6bb1cac1fe98f Mon Sep 17 00:00:00 2001
From: kevindehecker <kevindehecker@hotmail.com>
Date: Thu, 30 Nov 2017 20:46:14 +0100
Subject: [PATCH] Add upload capability to qtc, fix indent issue

---
 sw/tools/qt_project.py             |  2 ++
 sw/tools/qtc.creator.user_template | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sw/tools/qt_project.py b/sw/tools/qt_project.py
index f65020a68a..ee086d2784 100755
--- a/sw/tools/qt_project.py
+++ b/sw/tools/qt_project.py
@@ -125,6 +125,8 @@ with open(path.join(home_dir , "sw/tools/qtc.creator.user_template")) as input:
                 output.write(s.replace("!TARGET1!", aircraft + " " + target + ".compile"))
             elif "!TARGET2!" in s:
                 output.write(s.replace("!TARGET2!", aircraft))
+            elif "!TARGET3!" in s:
+                output.write(s.replace("!TARGET3!", aircraft + " " + target + ".upload"))
             elif "!PPRZHOME!" in s:
                 output.write(s.replace("!PPRZHOME!", getenv("PAPARAZZI_HOME")))
             else:
diff --git a/sw/tools/qtc.creator.user_template b/sw/tools/qtc.creator.user_template
index f241f25e90..eb3174f07a 100644
--- a/sw/tools/qtc.creator.user_template
+++ b/sw/tools/qtc.creator.user_template
@@ -19,7 +19,7 @@
    <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
     <value type="QString" key="language">Cpp</value>
     <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+     <value type="QByteArray" key="CurrentPreferences">gnu</value>
     </valuemap>
    </valuemap>
    <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
@@ -31,7 +31,7 @@
    <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
    <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
    <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">1</value>
+   <value type="int" key="EditorConfiguration.IndentSize">2</value>
    <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
    <value type="int" key="EditorConfiguration.MarginColumn">80</value>
    <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
@@ -42,7 +42,7 @@
    <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
    <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
    <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
-   <value type="int" key="EditorConfiguration.TabKeyBehavior">1</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
    <value type="int" key="EditorConfiguration.TabSize">2</value>
    <value type="bool" key="EditorConfiguration.UseGlobal">false</value>
    <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
@@ -167,10 +167,10 @@
     </valuelist>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments">-C $PAPARAZZI_SRC -f Makefile.ac AIRCRAFT=!TARGET3!</value>
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">make</value>
     <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run make</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>