Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

Merge pull request #2197 from kevindehecker/qtc_tabfix_upload

Browse Source 
Qtcreator indent size fix and added upload feature
This commit is contained in:
Kirk Scheper
2018-01-29 20:15:20 +01:00
committed by GitHub
parent b1a2d69e20 b8a3bb1960
commit 2d86a0b60a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/tools/qt_project.py
+2
View File
@@ -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")) output.write(s.replace("!TARGET1!", aircraft + " " + target + ".compile"))
elif "!TARGET2!" in s: elif "!TARGET2!" in s:
output.write(s.replace("!TARGET2!", aircraft)) output.write(s.replace("!TARGET2!", aircraft))
elif "!TARGET3!" in s:
output.write(s.replace("!TARGET3!", aircraft + " " + target + ".upload"))
elif "!PPRZHOME!" in s: elif "!PPRZHOME!" in s:
output.write(s.replace("!PPRZHOME!", getenv("PAPARAZZI_HOME"))) output.write(s.replace("!PPRZHOME!", getenv("PAPARAZZI_HOME")))
else: else:
sw/tools/qtc.creator.user_template
+6 -6
View File
@@ -19,7 +19,7 @@
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QString" key="language">Cpp</value> <value type="QString" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value"> <valuemap type="QVariantMap" key="value">
<value type="QByteArray" key="CurrentPreferences">CppGlobal</value> <value type="QByteArray" key="CurrentPreferences">gnu</value>
</valuemap> </valuemap>
</valuemap> </valuemap>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
@@ -31,7 +31,7 @@
<value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</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="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
<value type="int" key="EditorConfiguration.MarginColumn">80</value> <value type="int" key="EditorConfiguration.MarginColumn">80</value>
<value type="bool" key="EditorConfiguration.MouseHiding">true</value> <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
@@ -42,7 +42,7 @@
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
<value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value> <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
<value type="bool" key="EditorConfiguration.SpacesForTabs">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="int" key="EditorConfiguration.TabSize">2</value>
<value type="bool" key="EditorConfiguration.UseGlobal">false</value> <value type="bool" key="EditorConfiguration.UseGlobal">false</value>
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
@@ -167,10 +167,10 @@
</valuelist> </valuelist>
<value type="int" key="PE.EnvironmentAspect.Base">2</value> <value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value> <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments">-C $PAPARAZZI_SRC -f Makefile.ac AIRCRAFT=!TARGET3!</value>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value> <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">make</value>
<value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</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.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>