1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Commit Graph

5060 Commits

Author SHA1 Message Date
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
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
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
James Duley
675e1e4467 Merge branch 'next' into OP-1338_fix_specific_icu_so_version_number 2014-08-20 12:04:37 +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
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
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
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
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
Alessio Morale
eed81bd32a Merge remote-tracking branch 'origin/laurent/OP-1425_Small_typo_KpKi' into next 2014-08-13 16:36:34 +02:00
m_thread
2e7eea7383 Merge remote-tracking branch 'origin/next' into thread/OP-1400_Qt_5.3.1_Upgrade 2014-08-12 10:37:15 +02:00
Fredrik Arvidsson
1558c6d735 Merge remote-tracking branch 'origin/shared/OP-1398_qt531_upgrade' into thread/OP-1400_Qt_5.3.1_Upgrade
Conflicts:
	make/tools.mk
2014-08-11 23:25:37 +02:00
Stefan Karlsson
f569a9d8cb OP-1397 Filter out unnecessary debug messages and use asserts instead. 2014-08-10 20:19:29 +02:00
Stefan Karlsson
454d491e48 Merge branch 'next' into skarlsso/OP-1397_add_responsiveness_to_txpid
Conflicts:
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.cpp
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.h
2014-08-10 10:06:44 +02:00
Fredrik Arvidsson
bc5bf38ec5 Merge remote-tracking branch 'origin/skarlsso/OP-1423_populate_txpid_min_max_fields' into next 2014-08-09 10:28:07 +02:00
Laurent Lalanne
c90bf0f8e0 OP-1432 Reverse_all_motors_gui_fix : Fixes all Hexacopters error when Gcs load "Reverse all motors" parameter. 2014-08-09 04:26:16 +02:00
m_thread
717de29648 OP-1400 Upgraded make and copydata files to use Qt 5.3.1 Opensource. 2014-08-08 13:48:36 +02:00
Stefan Karlsson
4754e62a8e OP-1423 Use the TxPIDSettings::PIDsOptions enum instead of string comparisons 2014-08-05 19:31:26 +02:00
Laurent Lalanne
8821754b4a OP-1425 Small_typo_KpKi : Fix typo + french translation / updated translation for error messages 2014-08-05 12:49:35 +02:00
Alessio Morale
6884e9f378 Merge remote-tracking branch 'origin/amorale/OP-1395_flight_log_enhancements' into next 2014-08-02 20:41:58 +02:00
Stefan Karlsson
b285df98c7 OP-1423 Populate TxPID Min/Max fields with the current values from the Stabilization page 2014-08-01 13:37:41 +02:00
Stefan Karlsson
04d9d3191d OP-1397 Fix StabilizationSettingsBankX type for defaultValueForPidOption 2014-08-01 10:50:52 +02:00
Stefan Karlsson
f9343d9959 OP-1397 Fetch default values for GyroTau 2014-08-01 09:41:13 +02:00
Stefan Karlsson
12589abe7e OP-1397 Read default values for selected PID option from StabilizationSettingsBankX 2014-07-31 00:02:07 +02:00
Stefan Karlsson
3e4737949a OP-1397 Make sure the Min/MaxPIDx widgit limits get set before the values are populated 2014-07-31 00:01:09 +02:00
Stefan Karlsson
0416c39cdb OP-1397 Limit the Attitude Responsiveness values to 180 degrees 2014-07-31 00:00:33 +02:00
Stefan Karlsson
14770876cd OP-1397 Change spinbox properties when a Responsiveness item is selected 2014-07-30 23:50:10 +02:00
Alessio Morale
33439a8781 Merge remote-tracking branch 'origin/amorale/OP-1419_mag_r2c2_factor_not_saved' into rel-14.06 2014-07-29 00:58:23 +02:00
Alessio Morale
61cdd530c6 Merge remote-tracking branch 'origin/laurent/OP-1337_French_translations_updates' into rel-14.06 2014-07-29 00:55:10 +02:00
Alessio Morale
5f8900f18f OP-1419 - Uses MAG_TRANSFORM_NUMELEM instead 2014-07-27 20:40:17 +02:00
Alessio Morale
401aeee9eb OP-1419 - fix mag factor r2c2 not saved 2014-07-27 20:25:57 +02:00
Laurent Lalanne
e7ce7ae4f7 OP-1337 French_translations_updates : Typo 2014-07-27 12:55:22 +02:00
Laurent Lalanne
6d096cad4a OP-1337 French_translations_updates : Calibration help text again 2014-07-27 12:43:03 +02:00
Alessio Morale
4de36902d0 OP-1358 Update level trim code to use the newly provided fields 2014-07-21 11:01:11 +02:00
Alessio Morale
25c54ac16d Merge remote-tracking branch 'origin/laurent/OP-1063_Multi_config_Hexa_fixes' into rel-14.06 2014-07-16 20:07:31 +02:00
Alessio Morale
f6ab4cdfb1 Merge remote-tracking branch 'origin/filnet/OP-1383_fixed_GCS_crashes_when_using_serial_connections' into rel-14.06 2014-07-16 20:00:32 +02:00
Alessio Morale
cacccd985e Merge remote-tracking branch 'origin/filnet/OP-1393_SerialPlugin_destructor_generates_valgrind_error' into rel-14.06 2014-07-16 19:57:44 +02:00
Philippe Renon
859cb59df9 OP-1383 minor improvment to original fix + better comment 2014-07-15 00:02:16 +02:00