fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-05 23:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,044 Commits 852 Branches 161 Tags
cc8f159bcc8a5d52eab430edc68604f489a4e7ad
Commit Graph

6016 Commits

Author SHA1 Message Date
Lorenz Meier a0c9c88443 Merge branch 'master' of github.com:PX4/Firmware into st24 2014-10-04 15:35:59 +02:00
Lorenz Meier 63b7fac10c Merge pull request #1286 from PX4/mpc_track 
mc_pos_control: path following and smooth transitions on waypoints in AUTO
 2014-10-04 14:22:03 +02:00
Lorenz Meier 7bde4fa634 Revert "Use global position altitude to report HUD altitude, for consistency." 2014-10-04 12:31:16 +02:00
tstellanova 5846f217d0 Use global position altitude to report HUD altitude, for consistency. 
Otherwise the HUD altitude jumps between two very different values.
 2014-10-03 17:18:44 -07:00
Anton Babushkin 84908f8f3d mc_pos_control: AUTO speed limiting bug fixed 2014-10-02 15:45:02 +04:00
Denis Yeldandi 83632ec0ce Merge branch 'master' into ashtech 2014-10-02 14:28:07 +04:00
Thomas Gubler 2766285d56 mavlink: change message buffer size to 4 2014-09-30 16:00:14 +02:00
Thomas Gubler 5452732610 switch back to common mavlink dialect 2014-09-30 15:54:27 +02:00
Thomas Gubler 4fbeb73bda fix merge fail, remove double declaration of circuit breaker 2014-09-30 15:48:48 +02:00
Thomas Gubler e7313683cd Merge remote-tracking branch 'upstream/master' into swissfang 2014-09-30 15:40:11 +02:00
Thomas Gubler 6da52c5543 remove unnecessary variable 2014-09-30 15:39:01 +02:00
Thomas Gubler cc05f0f185 Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang 
Conflicts:
	src/lib/external_lgpl/tecs/tecs.cpp
	src/modules/commander/commander_params.c
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/navigator_main.cpp
 2014-09-30 15:38:27 +02:00
Denis Yeldandi 213f4aadbd Ashtech GPS driver 2014-09-30 15:44:47 +04:00
Thomas Gubler d11f05b12c commander: update gps and engine cb only when changed 2014-09-30 13:40:03 +02:00
Thomas Gubler d4c0dc2ba0 add and activate circuit breaker for gps failure detection 2014-09-30 11:20:30 +02:00
Thomas Gubler 1072a3380c enable engine failure circuit breaker 2014-09-30 11:11:46 +02:00
Thomas Gubler 70606d400b remove wrong comments 2014-09-30 11:11:30 +02:00
Anton Babushkin 70e5d4027a navigator: autocontinue fix 2014-09-30 09:08:31 +04:00
Thomas Gubler ab400089bc disable flight termination as default for now 2014-09-28 16:17:40 +02:00
Thomas Gubler 038e1cac03 increase default engine failure threshold 2014-09-28 16:17:17 +02:00
Thomas Gubler 964fddb387 make geofence update rate independent from positon update rate 2014-09-28 16:08:25 +02:00
Thomas Gubler 3efffb68e7 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/geofence.cpp
	src/modules/navigator/mission.cpp
 2014-09-28 12:36:26 +02:00
Anton Babushkin 1107f59036 Merge branch 'master' into mpc_track 2014-09-28 13:43:58 +04:00
Anton Babushkin 2d81c2cf46 mc_pos_control: commented code block removed 2014-09-28 13:43:42 +04:00
Anton Babushkin 1cc5f3778d Merge branch 'master' into takeoff_fix 2014-09-28 13:41:21 +04:00
Anton Babushkin cf4604f5c3 navigator/mission.cpp: indentation fixed 2014-09-28 13:34:44 +04:00
Lorenz Meier 10da4aab4e Merge branch 'master' of github.com:PX4/Firmware into st24 2014-09-27 23:48:32 +02:00
Thomas Gubler 8a18cfa386 datman: reduce task priority 2014-09-27 16:26:14 +02:00
Roman Bapst c8b1c5b119 Adapted for shared library use with ROS 2014-09-27 12:01:11 +02:00
Lorenz Meier 1dc22cea50 Merge pull request #1327 from PX4/termination_failsafe 
Termination failsafe
 2014-09-26 14:44:03 +02:00
Lorenz Meier ae02b76a5e Merge pull request #1325 from hsteinhaus/motor_limit_fb2 
Notify about multirotor motor limits
 2014-09-26 14:42:48 +02:00
Roman Bapst 4305625883 Added control_attitude function 2014-09-25 10:29:30 +02:00
Roman Bapst 43d9ebc231 Added control_attitude function and cleaned up 2014-09-25 10:28:49 +02:00
Roman Bapst 6329ca1a70 Adapted so that this header can also be used in a ROS environment 2014-09-25 10:25:57 +02:00
Roman Bapst 96b22f1ba8 Adapted uORB topic files to work with ROS (data stuctures are used but not the uORB functionality) 2014-09-25 10:20:15 +02:00
Roman Bapst f347e87391 Added base class for fixed wing attitude controller -> still working on it 2014-09-24 15:54:34 +02:00
Thomas Gubler 852159d9ed fw pos control: add param to enable/disable usage of terrain estimate during landing 2014-09-23 09:37:28 +02:00
Thomas Gubler 32131a069e inform in GCS when switching to laser 2014-09-23 09:37:16 +02:00
Thomas Gubler ab2e93a5d0 Merge remote-tracking branch 'upstream/master' into fwlandingterrain 2014-09-23 09:36:10 +02:00
Julian Oes 15eee418a0 Merge pull request #20 from swissfang/swissfang_mfcheck 
mf checker: fix landing check, ensure feedback from all checks is sent
 2014-09-23 12:13:30 +10:00
Thomas Gubler ec09f08008 mf checker: fix landing check, ensure feedback from all checks is sent 2014-09-22 17:21:33 +02:00
Thomas Gubler 73aa7d81e3 mf checker: fix landing check, ensure feedback from all checks is sent 2014-09-22 17:20:50 +02:00
Vladimir Ermakov ef5a93c09c FTP: Add file checksum calculation command. 2014-09-22 15:19:38 +04:00
Vladimir Ermakov 8eb3100616 FTP: Rename command. 
Payload: `<oldpath>\0<newpath>`
See: man 2 rename
 2014-09-22 13:48:43 +04:00
Thomas Gubler d113fcfc54 commander: move position of gps failure check 2014-09-22 10:59:54 +02:00
Thomas Gubler 5a0e0d0412 navigator: fix status information, remove fence_valid flag (this is handled by the geofence class) 2014-09-22 10:55:02 +02:00
Thomas Gubler c7966d56f5 geofence: better usefeedback if loaded 2014-09-22 10:54:51 +02:00
Thomas Gubler b5ffcfe3d1 Revert "datalink check: ignore onboard computer" 
This reverts commit 3f8793210b.

Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/commander_params.c
 2014-09-22 10:54:39 +02:00
Thomas Gubler e174117698 gps failure has priority over engine falure, in case both fail make sure 
that the gps failure mode does not turn on the engine
 2014-09-22 10:54:27 +02:00
Thomas Gubler 1fb8e76f0a fix typo in comment 2014-09-22 10:54:18 +02:00