11073 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Duley	3890c7858f	OP-1461 fix copyqt logic:removed use of environment variable in openpilotgcs.pri ... and force copy Qt libs when making package	2014-08-26 11:37:41 +12: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
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	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
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
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
Fredrik Larson	449653f01e	Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next" ... This reverts commit 4592de13bd, reversing changes made to a309537e62.	2014-08-16 23:53:02 +10:00
Corvus Corax	8daa5dfa12	Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification	2014-08-16 13:58:40 +02:00
Corvus Corax	4592de13bd	Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next	2014-08-16 13:53:16 +02:00
Corvus Corax	915c24c8b6	OP-1156 changed PID control loops to use generic pid library, readded unnecessary integral and derivative terms to vtolpathfollower	2014-08-15 21:00:48 +02:00
Corvus Corax	b1675a2804	OP-1156 added vtolpathfollower velocity limits to attitude control	2014-08-15 19:23:41 +02:00
Corvus Corax	b562fcb02e	OP-1156 fix path logic to not deviate from correct altitude too much	2014-08-15 17:56:57 +02:00
Fredrik Larsson	a309537e62	Merge branch 'hayvosh/logo_delete' into next	2014-08-15 14:27:59 +02:00
Fredrik Larson	731153043a	Old logo file	2014-08-15 21:23:49 +10:00
Fredrik Larson	ab43fbe7a8	Fix missing lib	2014-08-15 21:17:01 +10:00
Alessio Morale	f2c506ee2b	Merge remote-tracking branch 'origin/skarlsso/OP-1433_pid_options_order_2' into next	2014-08-14 10:32:38 +02:00
Stefan Karlsson	53fd76911e	OP-1433 Group the PID options by Roll, Pitch, Roll+Pitch, and Yaw.	2014-08-14 07:23:25 +02:00
Fredrik Arvidsson	341de560b6	Merge remote-tracking branch 'origin/abeck/OP_1401_qt_53_upgrade_macosx' into next	2014-08-13 23:41:09 +02:00
abeck70	eefe40c6a6	changed qt patch to mac target	2014-08-14 06:56:31 +10:00
abeck70	7cd4164358	following op-11400 qt 531 upgrade branch. Recommit mac tools.mk changes	2014-08-14 06:25:18 +10:00
Alessio Morale	eed81bd32a	Merge remote-tracking branch 'origin/laurent/OP-1425_Small_typo_KpKi' into next	2014-08-13 16:36:34 +02:00
Alessio Morale	30df5de332	uncrustify	2014-08-13 15:54:52 +02:00