fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-27 22:34:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,322 Commits 852 Branches 161 Tags
Commit Graph

9322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
d655865976 Merge pull request #1279 from PX4/takeoff_fix 
navigator: skip takeoff if already above takeoff altitude
 2014-10-05 12:32:14 +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
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
Thomas Gubler
b7c2ba75e3 Merge pull request #1377 from PX4/revert-1376-hud_alt_reporting 
Revert "Use global position altitude to report HUD altitude, for consist...
 2014-10-04 12:32:40 +02:00
Lorenz Meier
7bde4fa634 Revert "Use global position altitude to report HUD altitude, for consistency." 2014-10-04 12:31:16 +02:00
Lorenz Meier
ea269dbbbe Merge pull request #1376 from tstellanova/hud_alt_reporting 
Use global position altitude to report HUD altitude, for consistency.
 2014-10-04 11:51:28 +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
Lorenz Meier
47f151d4ce Deactivate FrSky telem by default 2014-09-30 15:19:06 +02:00
Lorenz Meier
47dcf88271 Flash optimization 2014-09-30 15:18:30 +02:00
Lorenz Meier
76e9710d76 Merge pull request #1213 from PX4/obcfailsafe 
Obc failsafe
 2014-09-30 14:50:26 +02:00
Thomas Gubler
d11f05b12c commander: update gps and engine cb only when changed 2014-09-30 13:40:03 +02:00
Thomas Gubler
8b7c57a0d0 px4io driver: update cb only when changed 2014-09-30 13:39:40 +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
Thomas Gubler
dec7c2b8d3 Merge remote-tracking branch 'upstream' into master_obcfailsafe 2014-09-30 10:51:02 +02:00
Lorenz Meier
8ced6bb49b Set filter frequency for hardware and software in parallel, always do so in the same order 2014-09-30 10:05:39 +02:00
Randy Mackay
3e1eec5906 mpu6k: set hardware filter during ACCELIOCLOWPASS 
also set from GYROIOCLOWPASS

Conflicts:
	mavlink/include/mavlink/v1.0
 2014-09-30 10:03:15 +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
Thomas Gubler
8a18cfa386 datman: reduce task priority 2014-09-27 16:26:14 +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
Thomas Gubler
549d60cfb6 Merge pull request #1368 from PX4/master_mfcheck 
mf checker: fix landing check, ensure feedback from all checks is sent
 2014-09-22 17:51:33 +02:00
Thomas Gubler
ec09f08008 mf checker: fix landing check, ensure feedback from all checks is sent 2014-09-22 17:21:33 +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 3f8793210b47bd8e09ed2adaabc2fab966db5df6.

Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/commander_params.c
 2014-09-22 10:54:39 +02:00