fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-09 03:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,377 Commits 852 Branches 161 Tags
19811bc73fb87662bd4e2a2145d3c4f5bc5aa201
Commit Graph

4386 Commits

Author SHA1 Message Date
Thomas Gubler ba2f55c3d7 Revert "increase ram" 
This reverts commit bc23b6239c.
 2014-10-07 10:09:03 +02:00
Thomas Gubler b64e675d53 Merge remote-tracking branch 'upstream/master' into swissfang 2014-10-07 10:02:01 +02:00
Thomas Gubler 5d52978bc7 Merge pull request #1341 from PX4/fwlandingterrain 
FW landing: use terrain estimate
 2014-10-07 10:01:16 +02:00
Lorenz Meier c7e8570f83 PX4IO firmware: Fix comment 2014-10-07 09:36:24 +02:00
Lorenz Meier 35caa8bd99 PX4IO Controls: compile fixes 2014-10-07 09:28:36 +02:00
Lorenz Meier 082a0c7aa5 Merge branch 'master' of github.com:PX4/Firmware into st24 2014-10-07 09:25:59 +02:00
Lorenz Meier c2687a7774 ST24 integration in IO firmware 2014-10-07 08:05:45 +02:00
Thomas Gubler c6de36d683 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-10-05 13:17:37 +02:00
Thomas Gubler 7f9a231b40 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 
Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp
 2014-10-05 13:17:32 +02:00
Lorenz Meier c0eefc983a File test compile fixes 2014-10-05 13:13:22 +02:00
Lorenz Meier 850c630e11 Navigator: Optimize for space 2014-10-05 13:09:19 +02:00
Lorenz Meier ff17f31cce Dataman: Optimize for space 2014-10-05 13:09:02 +02:00
Lorenz Meier 2587074a07 Compile fixes in navigator 2014-10-05 13:07:56 +02:00
Thomas Gubler ebc84b9f44 reduce mavlink message buffer size 2014-10-05 13:02:13 +02:00
Lorenz Meier 80ed01a5b4 Merge pull request #1363 from vooon/ftp_write_support 
FTP: write support
 2014-10-05 12:35:02 +02:00
Lorenz Meier 3239ba1570 Merge pull request #1360 from DonLakeFlyer/UnitTestFramework 
Upgraded unit test framework
 2014-10-05 12:33:21 +02:00
Lorenz Meier 2722921b30 Fixed function name of mission modification logic, attributed @DrTon 2014-10-05 12:30:29 +02:00
Vladimir Ermakov 0fbdb8d326 FTP: Return bytes written in payload. 2014-10-05 13:23:57 +04:00
Vladimir Ermakov 56a9d16fc4 FTP: Save errno in _copy_file(). 2014-10-05 13:19:13 +04:00
Thomas Gubler 3cebfd4045 Merge remote-tracking branch 'upstream/master' into takeoff_fix 
Conflicts:
	src/modules/navigator/mission.cpp
 2014-10-05 10:55:12 +02:00
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