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

9264 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
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
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
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 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
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
Thomas Gubler a8239b2c45 if V_RCL_LT < 0 go directly to termination 2014-09-22 10:54:00 +02:00
Thomas Gubler 21009e89a4 flight termination mavlink outtput: limit rate 2014-09-22 10:53:44 +02:00
Thomas Gubler d18f3ee70d make rc loss timeout a param 2014-09-22 10:52:56 +02:00
Thomas Gubler 973c034d6e engine failure detection 2014-09-22 10:52:48 +02:00
Thomas Gubler e3cac1999a navigator: geofence with global pos: reduce update rate 2014-09-21 18:07:21 +02:00
Thomas Gubler 31a17ce29a datman: reduce task priority 2014-09-21 18:07:13 +02:00
Thomas Gubler d6b669f497 commander: improve output on gf violation 2014-09-21 18:07:00 +02:00
Lorenz Meier feb848c12e Merge pull request #1366 from PX4/geofencehotfix 
geofence: lat/lon is double
 2014-09-19 05:19:40 -05:00
Thomas Gubler ec39427d79 geofence: lat/lon is double 
This is the same change as 5832948371 but
against the master branch.

Some time ago the type of lat and lon in the global_pos uorb topic was
changed but this use here was missed.
 2014-09-19 09:51:56 +02:00
Anton Babushkin fac2855579 Merge branch 'master' into mpc_track 2014-09-18 23:03:29 +02:00
Lorenz Meier 772c5f745c Make space on FMUv1 2014-09-17 16:37:10 -05:00
Lorenz Meier 9432fe559e Merge pull request #1361 from muharred/master 
Fixed parameter storage to support struct parameters.
 2014-09-17 16:01:32 -05:00
Lorenz Meier 65abf6eae9 Merge branch 'master' of github.com:PX4/Firmware into st24 2014-09-17 11:30:55 -05:00