Commit Graph

4839 Commits

Author SHA1 Message Date
Lorenz Meier 2697790aa5 Merge branch 'fixedwing_l1' of github.com:PX4/Firmware into fixedwing_l1 2013-09-08 17:05:18 +02:00
Lorenz Meier 14828cfda5 Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1 2013-09-08 00:50:37 +02:00
Lorenz Meier 751c026469 Merge pull request #381 from PX4/waypoint_loiter
Have systems loiter at the last waypoint
2013-09-07 09:50:37 -07:00
Lorenz Meier 056fe1c0b9 WIP 2013-09-07 13:50:38 +02:00
Lorenz Meier 8398de7515 WIP on controllers 2013-09-07 12:53:39 +02:00
Lorenz Meier b6dd579e0e Merge branch 'master' into fixedwing_l1 2013-09-07 12:24:40 +02:00
Lorenz Meier b599a32c16 Removed dysfunctional includes. Need to be re-done properly when finally implementing SITL. No use to leave untested stuff in tree. 2013-09-07 12:22:24 +02:00
Lorenz Meier fb9e98fb59 Cleanup of fixedwing startup code 2013-09-07 12:17:27 +02:00
Lorenz Meier f721c6f7e0 Merge branch 'waypoint_loiter' of github.com:PX4/Firmware into fixedwing_l1 2013-09-07 11:52:22 +02:00
Lorenz Meier 5111249eb8 Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1 2013-09-07 11:12:56 +02:00
Lorenz Meier bdabcd9627 Merge pull request #382 from PX4/bool_fix
Make bool on FMUv1 and FMUv2 behave the same
2013-09-06 13:27:33 -07:00
Lorenz Meier 79dfd83533 Merge pull request #383 from tstellanova/inject_version
grab the git hash and inject it into every log file header
2013-09-06 11:12:18 -07:00
tstellanova 23a355644b grab the git hash and inject it into every log file header 2013-09-06 10:18:08 -07:00
Lorenz Meier 58adc7e40b Make bool on FMUv1 and FMUv2 behave the same 2013-09-06 17:07:11 +02:00
Lorenz Meier 127832b8fd Have systems loiter at the last waypoint 2013-09-06 17:00:49 +02:00
Lorenz Meier 6104d14968 Have systems loiter at the last waypoint 2013-09-06 16:53:09 +02:00
Lorenz Meier 3d821b8131 Hotfix: Gain optimization 2013-09-05 22:32:13 +02:00
Lorenz Meier d74bea57ac Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1 2013-09-05 22:18:00 +02:00
Lorenz Meier 373a74adb9 Setting correct battery scaling for FMU-only setups 2013-09-05 17:39:36 +02:00
Lorenz Meier 02df2b8fe5 Merge pull request #380 from julianoes/hotfix_mag_calib
Workaround to prevent crash during mag calibration
2013-09-05 08:07:22 -07:00
Julian Oes e8c309fb14 Workaround to prevent crash during mag calibration 2013-09-05 15:57:09 +02:00
Lorenz Meier 84f44107dd Merge branch 'master' of github.com:PX4/Firmware 2013-09-05 13:24:51 +02:00
Lorenz Meier 5dbe53877a Fixed sched param setup in MAVLink app 2013-09-05 13:24:37 +02:00
Lorenz Meier aa785b0d2b Hotfix: Better error reporting, fixed sched param setup 2013-09-05 13:24:21 +02:00
Lorenz Meier 3968bd4c1b Merge pull request #379 from PX4/landed_bugfix
position_estimator_inav: land detector bug fixed
2013-09-05 03:39:55 -07:00
Anton Babushkin 1d7f3d0aa5 position_estimator_inav: land detector bug fixed 2013-09-05 12:20:03 +02:00
Lorenz Meier 09db74da0a Hotfix: Minor param adjustments based on flight testing 2013-09-05 10:27:35 +02:00
Lorenz Meier a022a3800c Merge pull request #366 from julianoes/python3_compat
Make px_mkfw.py and px_upload.py compatible with both python 2.7 and 3.3
2013-09-04 06:25:10 -07:00
Lorenz Meier c8b667c9cc Merge branch 'master' of github.com:PX4/Firmware into python3_compat 2013-09-04 15:08:16 +02:00
Julian Oes d30ba44f46 The python uploader can now reboot the board 2013-09-04 14:54:16 +02:00
Julian Oes 59373399ff Uploader works now with Python 2.7 and 3.3 2013-09-04 13:30:00 +02:00
Lorenz Meier 0c7995fd03 Avoid unneccesary cast 2013-09-04 08:12:51 +02:00
Lorenz Meier 5e9b1d6b2e Merge pull request #376 from PX4/scripts_fix
Tabs replaced by spaces in autostart scripts
2013-09-03 14:24:42 -07:00
Anton Babushkin 5030a27f48 Tabs replaced by spaces in autostart scripts 2013-09-03 23:16:32 +02:00
Lorenz Meier 175020cb5b Hotfix: Identified mavlink issue source, workaround, working on a fix 2013-09-03 22:45:33 +02:00
Lorenz Meier b5ec359c79 Merge pull request #375 from julianoes/hotfix_px4io_uart
Reset baudrate after px4io update
2013-09-03 08:12:49 -07:00
Julian Oes e301bb4d94 Reset baudrate after px4io update 2013-09-03 17:07:41 +02:00
Lorenz Meier 811e1151fa Fix UART buf sizes so that MAVLink transfers are not corrupted for all serial ports intended for MAVLink 2013-09-03 16:41:29 +02:00
Lorenz Meier 1c5ceb17e8 Merge pull request #304 from julianoes/ardrone_fixes
Prevent flips at high throttle
2013-09-03 05:58:56 -07:00
Julian Oes 96e7f42844 Merge branch 'master' into python3_compat 2013-09-03 09:34:25 +02:00
Lorenz Meier 2457013bbb Hotfix for USB: Starting MAVLink only on USB if connected. Needs rewrite of MAVLink and delay / retries for correct approach 2013-09-03 08:17:22 +02:00
Lorenz Meier 791e22f442 MAVLink workaround 2013-09-03 07:50:27 +02:00
Lorenz Meier 238f018090 Merge branch 'master' of github.com:PX4/Firmware 2013-09-03 07:50:05 +02:00
Lorenz Meier 3c0c11aec3 v4 compatibility 2013-09-03 07:49:57 +02:00
Lorenz Meier 29c06e3943 Set sane defaults for F330 2013-09-03 07:36:43 +02:00
Lorenz Meier b871e11943 Merge branch 'respect_takeoff_alt' 2013-09-03 07:32:03 +02:00
Anton Babushkin 40e1894872 Added parameter NAV_TAKEOFF_GAP 2013-09-02 23:30:32 +02:00
Anton Babushkin 193a52d813 multirotor_pos_control: added takeoff gap (hardcoded 3m), fixed code style 2013-09-02 23:13:01 +02:00
Lorenz Meier 24064d8848 Merge pull request #374 from julianoes/hotfix_mixer
Allow mixer upload when PWM is on
2013-09-02 12:25:46 -07:00
tstellanova 027d45acbf respect NAV_TAKEOFF_ALT instead of using hardcoded default takeoff value 2013-09-02 09:13:36 -07:00