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 |
|
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 |
|
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 |
|
Alessio Morale
|
5dbbda3adc
|
Merge remote-tracking branch 'origin/amorale/OP-1404_ublox_pvt_support' into next
|
2014-08-13 15:27:10 +02:00 |
|
Alessio Morale
|
cefc182a5e
|
Merge remote-tracking branch 'origin/amorale/OP-1405_25qXXX_support' into next
|
2014-08-13 15:25:16 +02:00 |
|
Fredrik Arvidsson
|
2bdd4d6d08
|
Merge remote-tracking branch 'origin/skarlsso/OP-1397_add_responsiveness_to_txpid' into next
|
2014-08-12 23:07:14 +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
|
61d45181a6
|
OP-1398 OP-1399 OP-1400 OP-1401 Qt 5.3.1 upgrade. Cleaning up merge artifacts committed by mistake.
|
2014-08-12 07:37:23 +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 |
|
Alessio Morale
|
1158c70a46
|
OP-1404 - minor cleanup, removed some duplicated code
|
2014-08-09 12:49:21 +02:00 |
|
Alessio Morale
|
2932045e3d
|
OP-1404 Fix NMEA data parsing for GSV
|
2014-08-09 12:04:25 +02:00 |
|
Corvus Corax
|
e3df461871
|
Merge branch 'andrecillo/OP-1317_IMU_wind_estimation' into next
|
2014-08-09 10:44:33 +02:00 |
|
Corvus Corax
|
c5fae5ee84
|
Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation
|
2014-08-09 10:43:48 +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 |
|
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 |
|
Alessio Morale
|
a18009e875
|
OP-1429 Change datatype for elevation and azimuth respectively to int8 and int16.
|
2014-08-06 12:55:07 +02:00 |
|
Stefan Karlsson
|
4754e62a8e
|
OP-1423 Use the TxPIDSettings::PIDsOptions enum instead of string comparisons
|
2014-08-05 19:31:26 +02:00 |
|
Alessio Morale
|
d04d630273
|
OP-1404 fix include file path
|
2014-08-05 17:25:28 +02:00 |
|
Alessio Morale
|
23d2368984
|
OP-1404 Fix nav-pvt.pdop data type
|
2014-08-05 16:50:38 +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
|
ea63def1c8
|
OP-1404 fix compilation with PIOS_GPS_MINIMAL, fix some copy/pastem madness
|
2014-08-04 18:17:01 +02:00 |
|
Alessio Morale
|
240eb8e573
|
OP-1404 - Prevent mixing pvt and other sentence solution data. use PDOP from pvt
|
2014-08-04 17:56:28 +02:00 |
|
Alessio Morale
|
d3569927a0
|
OP-1404 fix unit scaling for pvt, use check_msgtracker,
|
2014-08-04 11:04:35 +02:00 |
|
Alessio Morale
|
6f4b1d5c03
|
OP-1404 uncrustify
|
2014-08-03 15:27:30 +02:00 |
|
Alessio Morale
|
c68dd3c00e
|
OP-1404 - PVT will provide SOL+VELNED+POSLLH+Time. DOP will provide all dop values
|
2014-08-03 15:04:40 +02:00 |
|
Alessio Morale
|
1dd05c24cc
|
OP-1404 - Fix compilation with PIOS_GPS_MINIMAL defined
|
2014-08-03 12:50:42 +02:00 |
|
Alessio Morale
|
0976fb6e1b
|
OP-1404 - Add support for UBlox PVT sentence
|
2014-08-03 12:50:21 +02:00 |
|
Alessio Morale
|
a6502518be
|
OP-1405 - Add support for 25qxxx series of flash memories
|
2014-08-02 23:05:36 +02:00 |
|
Alessio Morale
|
99f09d588f
|
Merge branch 'amorale/OP_1403_gen_i2c_spi_hmc5x83_driver' into next
|
2014-08-02 22:05:55 +02:00 |
|
Alessio Morale
|
016ba6940d
|
OP-1403 - drop attitude/revolution as it has been supersede by StateEstimation module
|
2014-08-02 20:48:56 +02:00 |
|