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 |
|
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 |
|
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 |
|
Corvus Corax
|
09e8b38407
|
OP-1156 fixed EmergencyFlyaway detection algorithm
|
2014-08-12 19:12:05 +02:00 |
|
Corvus Corax
|
4fc071978c
|
OP-1156 commit changed xml file
|
2014-08-12 18:23:45 +02:00 |
|
Corvus Corax
|
56e4127bca
|
OP-1156: add path_direction as a source for yaw as suggested by Werner :)
|
2014-08-12 18:18:07 +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 |
|
Corvus Corax
|
ea4e7962a6
|
OP-1156 fixed wrong callback ID assignment for pathfollower callback diagnostics
|
2014-08-10 21:17:55 +02:00 |
|
Stefan Karlsson
|
f569a9d8cb
|
OP-1397 Filter out unnecessary debug messages and use asserts instead.
|
2014-08-10 20:19:29 +02:00 |
|
Corvus Corax
|
8944419b0f
|
OP-1156 refactored pathfollower - new unified module as delayed callback - compiles but untested
|
2014-08-10 19:41:40 +02:00 |
|
Corvus Corax
|
a3d18bb578
|
Merge remote-tracking branch 'origin/D-Lite/PathFollowerImprovements' into corvuscorax/OP-1156_pathfollower-unification
|
2014-08-10 13:53:52 +02:00 |
|
Corvus Corax
|
ca1923f76f
|
OP-1156: Added new (stub template) pathFollower Module as well as builkd environment changes to compile it instead of old pathfollowers
|
2014-08-10 12:50:38 +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 |
|