Fredrik Larson
079e251cc4
Merge branch 'next' into fw_wiz
2014-08-21 02:08:17 +10: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
m_thread
82a3590da5
OP-1222 Fixed a bug with Actuator settings and banks to use for motors.
2014-08-18 13:14:07 +02:00
m_thread
5354723928
OP-1222 Renamed some files.
...
Fixed Wing wizard made only available on Revo
Moved motor for fixed wing to channel 3 since channel 3 got its own timer.
Fixed a crash in config plugin when selecting Fixed Wing.
Added code in outputcalibration in Fixed Wing setup to set min and max values as well as neutral for servos.
Added Controller type Nano.
2014-08-18 01:20:31 +02:00
Fredrik Larson
137a6e4308
Refactor name of legacy servos, remove PID hard coding from the config
...
helper
2014-08-18 03:47:16 +10:00
Fredrik Larson
00ed28c983
Start adding PID page
2014-08-18 03:43:00 +10:00
Fredrik Larson
a46d5316ec
Tooltips
2014-08-18 02:51:49 +10:00
Fredrik Larson
2b6629e03a
Change wording, standard servos to analog servos
2014-08-17 23:06:01 +10:00
Fredrik Larson
ea1e95db7b
Minor refactroring of a type in a class, change ESC_TYPE and geter /
...
serter to be actuator type as we are dealing with servos. Add servos to
enum, remove hard coded min / max for now.
2014-08-17 22:55:11 +10:00
Fredrik Larson
3fc991fe2c
Add the outputpage for fixed wing support
2014-08-17 20:31:57 +10: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
Fredrik Larson
dec52c675c
Merge branch 'next' into kf_hayvosh/OP-1222_FW_Wizard_lets_get_this_finished
2014-08-17 04:15:38 +10:00
Fredrik Larson
3a4b27df5d
Minor formatting of all Wiz pages for consitency
2014-08-17 04:15:11 +10:00
Fredrik Larson
4c242fa2e0
Wording of FW wizard page
2014-08-17 04:01:21 +10: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
741efd9281
Add image
2014-08-17 01:57:15 +10:00
Fredrik Larson
0b147fded5
Minor formatting, add wizard image
2014-08-17 01:41:14 +10:00
Fredrik Larson
449653f01e
Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next"
...
This reverts commit 4592de13bda309537e62
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
Fredrik Larson
dd07ccbec9
Resolve merge conflicts
2014-08-16 14:20:31 +10:00
Fredrik Larson
501441d3fb
Merge branch 'next' into kf_hayvosh/OP-1222_FW_Wizard_lets_get_this_finished
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
2014-08-16 12:12:15 +10: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
