James Duley
d7cdc540b0
OP-1853 Ground build tidy: removed now unneeded uavobject-synthetics.pro
2015-05-13 12:47:29 +01:00
James Duley
2610a4c463
OP-1853 Ground build tidy: make the gcs build handle generating its own
...
UAVOs.
This removes warnings and better handles dependencies to speed up rebuilds
New file uavobjgenerator.pri define a qmake compiler of the
uavobjgenerator
2015-05-13 12:47:28 +01:00
James Duley
060d8f1cc1
OP-1853 Ground build tidy: make non PHONY target UAVOBJGENERATOR
2015-05-13 12:47:28 +01:00
James Duley
90420dd164
OP-1853 Ground build tidy: unquote UAVOBJGENERATOR
2015-05-13 12:47:28 +01:00
James Duley
5ab283677f
OP-1853 Ground build tidy: Make UAVO_BUILD_CONF use GCS_BUILD_CONF to match qtcreator builds and make things easier later
2015-05-13 12:47:28 +01:00
James Duley
24a270772e
OP-1853 Ground build tidy: Remove old android line
2015-05-13 12:47:27 +01:00
James Duley
5a2806c3c0
OP-1853 Ground build tidy: Remove hardcoded prefix from uavobjgenerator output
2015-05-13 12:47:27 +01:00
James Duley
9d31ca939c
OP-1853 Ground build tidy: remove targetPath as not needed.
...
Could be replaced with builtin $$shell_path but that appears
to be buggy on windows git bash
2015-05-13 12:46:04 +01:00
James Duley
7967480c74
OP-1853 Ground build tidy: remove unneeded line in translations.pro
2015-05-10 20:47:50 +12:00
James Duley
f07dddc965
OP-1853 Ground build tidy: remove old vcproj stuff we don't support and wouldn't work anyway
2015-05-10 20:47:50 +12:00
James Duley
e675ae7f7b
OP-1853 Ground build tidy: remove old qt stuff from translations.pro
2015-05-10 20:47:50 +12:00
abeck70
f8dbf29459
Merge branch 'abeck/OP-1858-autotakeoff' into next
2015-05-08 22:17:38 +10:00
abeck70
7fd08ef990
OP-1858 takeoff in nav address code review comments
2015-05-08 22:04:44 +10:00
abeck70
4ccdc46311
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
2015-05-08 21:48:34 +10:00
abeck70
78acf10f6b
OP-1791 updated warning message
2015-05-08 21:36:39 +10:00
abeck70
3e141fda3a
Merge branch 'danielk/OP-1852_version_windowbar' into next
2015-05-08 21:34:54 +10:00
abeck70
ec60d92ca4
Merge branch 'danielk/OP-1855_limit_error_flightmodeposition' into next
2015-05-08 21:34:41 +10:00
Daniël Koek
549f0c2f60
OP-1852
2015-05-08 21:31:03 +10:00
Daniël Koek
20b01a548a
OP-1855 changed , to :
2015-05-08 21:28:51 +10:00
abeck70
2130d683d8
Merge branch 'abeck/OP-1863-rate-maxpitch' into next
2015-05-08 21:18:05 +10:00
abeck70
d97cf3a430
OP-1863 RateTrainer add additional limits to avoid RateTrainer as a thrust mode appearing
2015-05-08 21:16:03 +10:00
James Duley
d39639ca68
Remove old pro.user file
2015-05-06 18:23:12 +12:00
James Duley
9923803e59
Merge branch 'parched/OP-1806_version-info_escape_strings' into next
2015-05-06 17:11:17 +12:00
abeck70
143f09d216
Merge remote-tracking branch 'origin/rel-15.02.02' into next
...
Conflicts:
flight/modules/Actuator/actuator.c
2015-05-06 08:35:21 +10:00
abeck70
72b0d053ef
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
2015-05-05 21:53:26 +10:00
abeck70
7bad2f8163
Merge branch 'abeck/OP-1867-pathplanner-autoland' into next
2015-05-05 21:35:25 +10:00
abeck70
0bdec71020
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1867-pathplanner-autoland
2015-05-05 21:34:26 +10:00
abeck70
30a70ca3ec
Merge branch 'abeck/OP-1863-rate-maxpitch' into next
2015-05-05 21:28:56 +10:00
abeck70
5c13db221b
OP-1867 autoland/takeoff
...
Allow takeoff after land on abort when in takeoff flight mode without having to change flight mode.
2015-05-04 21:48:24 +10:00
abeck70
16cc9f1512
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff
2015-05-04 21:15:24 +10:00
abeck70
5ca9d979e6
OP-1858 if previous mode was autotakeoff, ignore wp start position and go from current position.
2015-05-04 21:14:54 +10:00
abeck70
2ec40072ab
OP-1863 ratetrainer fix coding error. ratetrainer should now work.
2015-05-04 17:36:04 +10:00
abeck70
d4561e9cd8
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1863-rate-maxpitch
2015-05-04 08:41:12 +10:00
abeck70
ca03092fb4
OP-1863 ratetrainer update stab handler to support new outerloop directwithlimits mode
2015-05-04 08:40:06 +10:00
Laurent Lalanne
8240c64ad8
Update WHATSNEW.txt - rel-15.02.02-RC3
2015-05-03 13:27:39 +02:00
Laurent Lalanne
842330922f
Merge branch 'amorale/OP-1857_ppm_on_flexi_cc' into rel-15.02.02
2015-05-03 13:22:47 +02:00
Laurent Lalanne
c1566fa7d2
Update WHATSNEW.txt - rel-15.02.02-RC2
2015-05-03 12:23:18 +02:00
RS2K
77eacb2294
OP-1835 - Motor Constraints 15.02.02 100% throttle curves default
2015-05-02 17:41:47 -05:00
Laurent Lalanne
93ff480b7a
15.02.02 hotfix for tricopter servo on wizard
2015-05-02 21:02:14 +02:00
Alessio Morale
c227686854
uncrustify
2015-05-02 20:27:28 +02:00
RS2K
2fca0b1d9b
OP-1835 - Motor Constraints for 15.02.02 - Quick fix to disable clipping. Bit of code not in the original fix I had to deal with.
2015-05-02 13:11:40 -05:00
RS2K
57d062ff67
OP-1835 - Motor Constraints for 15.02.02
...
OP-1835 - Motor Constraints for 15.02.02
2015-05-02 12:55:43 -05:00
Philippe Renon
9a312ef115
uncrustified
2015-05-02 16:46:35 +02:00
Philippe Renon
b4b93bee93
Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next
2015-05-02 16:34:15 +02:00
Laurent Lalanne
5475b395e8
OP-1827 File encoding, "Ragin' Cajun"
2015-05-02 16:11:13 +02:00
abeck70
b4d727db98
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1863-rate-maxpitch
2015-05-01 21:53:35 +10:00
m_thread
c4c60c897b
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2015-05-01 09:53:35 +02:00
abeck70
174c0e8363
Merge branch 'abeck/OP-1867-pathplanner-autoland' into next
2015-05-01 17:46:44 +10:00
m_thread
b8653d44da
Merge branch 'thread/OP-1837_SRXL_Cleanup' into next
2015-05-01 09:46:32 +02:00
abeck70
87f521bde3
OP-1867 autoland
...
build fix
2015-04-30 23:11:32 +10:00
