Laurent Lalanne
|
5f3699fbaa
|
OP-1362 make_ts_errors Fix for 'make ts' errors. Still two errors, with one to fix (xmlconfig.cpp:61: Class 'XmlConfig' lacks Q_OBJECT macro)
|
2014-08-26 23:30:57 +02:00 |
|
Alessio Morale
|
2c99d4172b
|
Merge branch 'master' into next
|
2014-08-26 21:34:56 +02:00 |
|
Alessio Morale
|
e9799e6c2e
|
Merge branch 'rel-14.06.01'
|
2014-08-26 21:21:22 +02:00 |
|
Alessio Morale
|
805ce3b895
|
FIx WhatsNEW for release
|
2014-08-26 21:19:59 +02:00 |
|
Alessio Morale
|
10f5d7c531
|
Merge remote-tracking branch 'origin/skarlsso/OP-922_fix_fw_DEBUG_compile_errors' into next
|
2014-08-26 01:05:32 +02:00 |
|
Alessio Morale
|
5857b302b7
|
Merge remote-tracking branch 'origin/skarlsso/OP-1447_output_calibration_slider_adjustments' into next
|
2014-08-26 01:04:35 +02:00 |
|
Philippe Renon
|
174b9bb611
|
Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next
Conflicts:
ground/openpilotgcs/src/python.pri
|
2014-08-26 00:08:53 +02:00 |
|
Alessio Morale
|
7ed3d9f7ad
|
Merge remote-tracking branch 'origin/laurent/OP-1432_Reverse_all_motors_gui_fix' into next
|
2014-08-25 14:27:19 +02:00 |
|
Alessio Morale
|
74a8e6f943
|
Update WhatsNew for release
|
2014-08-25 14:03:15 +02:00 |
|
James Duley
|
4fa543c925
|
OP-1324 fixed the mingw version
|
2014-08-25 09:08:42 +12:00 |
|
Fredrik Larson
|
c38242f627
|
Missed a damn space, OCD won't let me leave it as is.
|
2014-08-25 02:55:19 +10:00 |
|
Fredrik Larson
|
4874bdc120
|
Mac path fix for Python
|
2014-08-25 02:49:00 +10:00 |
|
Fredrik Larson
|
a0fda9a60f
|
Merge branch 'txpid_typo' into rel-14.06.01
|
2014-08-24 10:24:24 +10:00 |
|
Fredrik Larson
|
35a6807e63
|
Merge branch 'txpid_typo' into next
|
2014-08-24 10:23:14 +10:00 |
|
Laurent Lalanne
|
ccb97f014c
|
OP-1241 TxPID_Bank3 : Similar bug while GET data from bank
|
2014-08-24 02:15:24 +02:00 |
|
Laurent Lalanne
|
8daffcc624
|
OP-1432 Reverse_all_motors_gui_fix : Fixes all Hexacopters error when Gcs load "Reverse all motors" parameter.
|
2014-08-24 00:02:34 +10:00 |
|
Stefan Karlsson
|
26f98b7732
|
OP-1450 Turn on high resolution support for OSX
|
2014-08-23 23:40:31 +10:00 |
|
Corvus Corax
|
41e1b719a9
|
Merge remote-tracking branch 'origin/corvuscorax/OP-1454_weakleveling-hotfix' into rel-14-06.01
|
2014-08-23 15:27:20 +02:00 |
|
Corvus Corax
|
e7aa12be94
|
Merge remote-tracking branch 'origin/corvuscorax/OP-1454_weakleveling-hotfix' into next
|
2014-08-23 15:25:24 +02:00 |
|
James Duley
|
3dca248938
|
OP-1324 fixed regex
|
2014-08-23 15:51:56 +12:00 |
|
James Duley
|
3e8de2e362
|
OP-1324 removed use of env variable in python.pri
|
2014-08-23 14:53:22 +12:00 |
|
Fredrik Larson
|
23ba253cba
|
Not sure if this is needed but updated the Python pri file to reflect the
correct version
|
2014-08-23 09:49:35 +10:00 |
|
Corvus Corax
|
c5e0e58e6a
|
OP-1454 - fix weak leveling bug
|
2014-08-22 22:42:12 +02:00 |
|
Stefan Karlsson
|
070c2569ff
|
OP-922 Add pios_user_fs_id to oplinkmini to fix DEBUG=YES link error
|
2014-08-21 22:37:38 +02:00 |
|
Stefan Karlsson
|
607f7ae4bc
|
OP-922 Add missing UAVO source files to the fw_osd target
|
2014-08-21 20:15:56 +02:00 |
|
Fredrik Larson
|
2015968911
|
Merge branch 'copy' into next
|
2014-08-21 17:45:14 +10:00 |
|
James Duley
|
41fdf4e81f
|
OP-1338 changed to check if qt in tools
|
2014-08-21 08:49:39 +12:00 |
|
Corvus Corax
|
d6dc983045
|
Merge branch 'corvuscorax/OP-1156_pathfollower-unification' into next
|
2014-08-20 17:08:28 +02:00 |
|
Corvus Corax
|
4653c77296
|
OP-1156 removed old pathfollower implementations
|
2014-08-20 17:00:50 +02:00 |
|
Corvus Corax
|
1540fe0716
|
OP-1156 cleaned up updateAutoPilotVtol() function
|
2014-08-20 16:02:48 +02:00 |
|
Corvus Corax
|
70460e593e
|
OP-1156 fixes as suggested per review
|
2014-08-20 15:29:29 +02:00 |
|
James Duley
|
675e1e4467
|
Merge branch 'next' into OP-1338_fix_specific_icu_so_version_number
|
2014-08-20 12:04:37 +12:00 |
|
Corvus Corax
|
801ff1ae82
|
Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification
|
2014-08-19 23:15:53 +02:00 |
|
Corvus Corax
|
779eb8d772
|
OP-1156 placed Werners positionhold speed offset back in place
|
2014-08-19 23:14:46 +02:00 |
|
James Duley
|
47e110050d
|
Merge branch 'python_fixes' into OP-1324_fix_build_when_python_isnt_python2
|
2014-08-19 11:50:41 +12:00 |
|
James Duley
|
c2af28246f
|
redirect stderr to stdout for shell python --version
|
2014-08-19 11:50:03 +12:00 |
|
James Duley
|
a4efd8539a
|
Merge branch 'python_fixes' into OP-1324_fix_build_when_python_isnt_python2
|
2014-08-19 10:42:33 +12:00 |
|
James Duley
|
f4ddbe53eb
|
fixed whitespace
|
2014-08-19 10:41:24 +12:00 |
|
James Duley
|
d22b0706aa
|
Merge branch 'parched/OP-1324_fix_build_when_python_isnt_python2' of ssh://git.openpilot.org/OpenPilot into python2_fixes
|
2014-08-17 11:50:31 +12:00 |
|
James Duley
|
9e8beda778
|
added quotation marks for PYTHON
|
2014-08-17 11:08:02 +12:00 |
|
Corvus Corax
|
bc8ccb7be7
|
Revert "Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next""
This reverts commit 449653f01e .
|
2014-08-16 23:59:37 +02:00 |
|
Fredrik Larson
|
c620c7fc29
|
Change message about installing 7zip on Linux, packaging changed in latest
LTS
|
2014-08-17 07:19:29 +10:00 |
|
Corvus Corax
|
638698763e
|
Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification
|
2014-08-16 20:50:26 +02:00 |
|
Corvus Corax
|
760ae118e9
|
OP-1156 changed yaw math from interval [0..360] to [-180..180]
|
2014-08-16 20:48:56 +02:00 |
|
Corvus Corax
|
d26d717d8c
|
Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification
|
2014-08-16 19:58:11 +02:00 |
|
Stefan Karlsson
|
454ea624ba
|
OP-1450 Turn on high resolution support for OSX
|
2014-08-16 19:58:04 +02:00 |
|
Stefan Karlsson
|
3d8d803c33
|
OP-922 Fix missing ppm_id to ppm_out_id rename
|
2014-08-16 16:58:16 +02:00 |
|
Stefan Karlsson
|
4ba9208727
|
OP-922 Comment out the unused DEBUG variable in rscode
|
2014-08-16 16:58:16 +02:00 |
|
Stefan Karlsson
|
232d9c10b2
|
OP-922 Make it explict that matrix_mult_3x3f should be static inline
|
2014-08-16 16:58:16 +02:00 |
|
Stefan Karlsson
|
34983a2d28
|
OP-922 Fix typo in pios_tim.c
|
2014-08-16 16:58:15 +02:00 |
|