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

9606 Commits

Author SHA1 Message Date
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
Denis Yeldandi e0a21000c8 Merge branch 'ashtech' into ashtech_hi_freq 2014-10-04 09:22:17 +04:00
Denis Yeldandi 04ceb3c95d Fixed km/h -> knots in POS 2014-10-04 09:21:47 +04: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 a960fcbdef Increased ashtech POS frequency and increased baudrate 2014-10-02 14:34:20 +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 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
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 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
Lorenz Meier 08520e575d Merge branch 'st24' of github.com:PX4/Firmware into st24 2014-09-27 23:48:48 +02: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
Lorenz Meier 7dd81c8cb2 WIP on laser driver unit test 2014-09-27 16:21:25 +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 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
Julian Oes 17a29dba92 Merge pull request #21 from swissfang/sbasdisable 
ubx: add sbas config, default to disable
 2014-09-23 12:12:55 +10:00