dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
9,515 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

9515 Commits

Author SHA1 Message Date
Lorenz Meier 8d187cc2fa Merge branch 'master' of github.com:PX4/Firmware into sf0x_test 2014-10-07 12:09:47 +02:00
Lorenz Meier 79e5ec6465 Merge pull request #1151 from PX4/offboard2_externalsetpointmessages 
Offboard2: Handle external setpoint messages
 2014-10-07 10:29:04 +02:00
Lorenz Meier d856356fce Merge pull request #1372 from PX4/swissfang 
UAV Outback challenge improvements from Team Swiss Fang
 2014-10-07 10:13:56 +02:00
Thomas Gubler c7f7de352d revert some of the OBC rate changes 2014-10-07 10:12:56 +02:00
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
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
Thomas Gubler 61352b8e1a remove warnx 2014-10-05 12:52:04 +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
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 f4851c1b14 ubx: disable sbas configuration per default 2014-09-30 15:50:58 +02:00
Thomas Gubler 4fbeb73bda fix merge fail, remove double declaration of circuit breaker 2014-09-30 15:48:48 +02:00
Thomas Gubler c5a1ddd8f2 re-enable MC apps on FMUV1 2014-09-30 15:42:56 +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
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