fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 07:03:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,862 Commits 852 Branches 161 Tags
a7a68c88a25c2c4cb401fb4f8894de6f4c280ba2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Gubler a153fb4b99 Merge pull request #1459 from PX4/navprio 
Adjust navigator priority
 2014-11-16 13:31:09 +01:00
Thomas Gubler 4f5e2e379d Merge pull request #1450 from PX4/fix_navstates 
Fix navstates
 2014-11-13 10:55:26 +01:00
Thomas Gubler 5afc64e424 Merge pull request #1443 from PX4/fix_strangertl 
Fix strange RTL behavior
 2014-11-12 13:19:07 +01:00
Thomas Gubler d0fe75f101 Merge pull request #1446 from friekopter/no_beep 
Avoid Camflyer ESC warning in Standby
 2014-11-11 21:10:17 +01:00
Thomas Gubler 25df841118 Merge pull request #1429 from tumbili/board_rot 
new_sensor_rotation_option
 2014-11-04 22:50:33 +01:00
Thomas Gubler a917b0d40b Merge pull request #1426 from PX4/gyrotemp 
L3GD20: Output gyro temperature in report
 2014-11-03 15:46:40 +01:00
Thomas Gubler da2b2500f7 Merge pull request #1422 from jgoppert/encoder_logging 
Encoder logging support.
 2014-11-02 22:03:51 +01:00
Thomas Gubler 9b704f27fc Merge pull request #1400 from sjwilks/discovery_config 
Add a min PWM output so motors idle on arming.
 2014-10-23 14:45:32 +02:00
Thomas Gubler 91b4d85b46 Merge pull request #1379 from PX4/sf0x_test 
Sf0x test
 2014-10-07 14:53:29 +02:00
Thomas Gubler 537991b83c Revert "Remove range command" 
This reverts commit c58d845339.
 2014-10-07 14:48:41 +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
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
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
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
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
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
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
Thomas Gubler 8a18cfa386 datman: reduce task priority 2014-09-27 16:26:14 +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
Thomas Gubler 69eb222d4e ubx: add sbas config, default to disable 2014-09-22 19:04:24 +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 73aa7d81e3 mf checker: fix landing check, ensure feedback from all checks is sent 2014-09-22 17:20:50 +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
Thomas Gubler 808cc60cda navigator: geofence with global pos: reduce update rate 2014-09-21 18:04:11 +02:00
Thomas Gubler 885d3e8ca4 datman: reduce task priority 2014-09-21 18:03:52 +02:00
Thomas Gubler 4b8a385658 commander: improve output on gf violation 2014-09-21 18:03:31 +02:00
Thomas Gubler 980175bb60 commander: move position of gps failure check 2014-09-21 13:32:47 +02:00
Thomas Gubler 3e41945cc6 flare pitch limit: apply at throttle lim altitude 2014-09-21 10:46:46 +02:00
Thomas Gubler 54380e34b3 navigator: fix status information, remove fence_valid flag (this is handled by the geofence class) 2014-09-20 09:45:22 +02:00
Thomas Gubler 2148464a70 geofence: better usefeedback if loaded 2014-09-20 08:44:30 +02:00
Thomas Gubler 6962c5eedf Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe 
Conflicts:
	src/modules/navigator/mission.cpp
 2014-09-20 08:22:51 +02:00
Thomas Gubler 7a5958b3bb Merge branch 'fohaltitude' into fohaltitude_swissfang 2014-09-19 16:01:10 +02: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
Thomas Gubler 940264f6ab Revert "datalink check: ignore onboard computer" 
This reverts commit 3f8793210b.

Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/commander_params.c
 2014-09-13 16:23:28 +02:00
Thomas Gubler 06ad49a690 Merge remote-tracking branch 'private_swissfang/stable' into obcfailsafe 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
 2014-09-13 15:50:51 +02:00
Thomas Gubler dd5627726d Merge pull request #14 from swissfang/launchpitchlimit_swissfang 
FW: additional upper pitch limit during launch (swissfang)
 2014-09-11 22:01:57 +02:00
Thomas Gubler 26e6d7e12e Merge branch 'launchpitchlimit' into launchpitchlimit_master 2014-09-08 13:01:16 +02:00
Thomas Gubler 98d643fdf8 Merge branch 'launchpitchlimit' into launchpitchlimit_swissfang 2014-09-08 13:01:02 +02:00
Thomas Gubler df181455eb launch pitch limit: add mtecs interface 2014-09-08 13:00:26 +02:00
Thomas Gubler 33c0cd2e56 Merge remote-tracking branch 'private_swissfang/master' into launchpitchlimit_swissfang 2014-09-08 12:45:09 +02:00
Thomas Gubler b57c73c70c Merge remote-tracking branch 'upstream/master' into launchpitchlimit_master 2014-09-08 12:44:29 +02:00
Thomas Gubler daf1618420 additional upper pitch limit during launch 
The pitch limit can be used by the laucnhdetector to limit pitch during
critical phases of a launch. For example this can be used to limit pitch
while attached to a bungee differently from the standard pitch limit.
 2014-09-08 12:42:42 +02:00
Thomas Gubler e8503ab3f9 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-07 15:33:11 +02:00
Thomas Gubler 97f7c0088f fix typo in comment 2014-09-07 15:32:28 +02:00
Thomas Gubler eb90979ba8 if V_RCL_LT < 0 go directly to termination 2014-09-07 15:31:58 +02:00
Thomas Gubler 9608e7adeb flight termination mavlink outtput: limit rate 2014-09-07 15:29:53 +02:00
Thomas Gubler 3d6fcfcf6b Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe 2014-09-07 15:25:54 +02:00
Thomas Gubler 74601939a8 Revert "do send termination info only once" 
This reverts commit 5418412777.
 2014-09-07 13:45:21 +02:00
Thomas Gubler 5418412777 do send termination info only once 2014-09-07 13:05:03 +02:00
Thomas Gubler cf601c09bf swissfang: don't build MC apps on FMU1 2014-09-07 12:21:49 +02:00
Thomas Gubler e056fbb703 add heightrate ff for tecs 2014-09-06 15:15:30 +02:00
Thomas Gubler f315be5416 FW: in seatbelt/althold on ground reset integrators 2014-09-06 10:36:51 +02:00
Thomas Gubler 1d9c99956f make rc loss timeout a param 2014-09-05 12:06:05 +02:00
Thomas Gubler f62be0eebd Merge branch 'loiteracceptance' into obcfailsafe 2014-09-05 10:19:08 +02:00
Thomas Gubler 0a6267e010 update comment 2014-09-05 10:18:51 +02:00
Thomas Gubler 81837dcdde update comment 2014-09-05 10:18:25 +02:00
Thomas Gubler 4c7d670793 loiter mission items: better reached check for FW 2014-09-05 10:15:31 +02:00
Thomas Gubler eec6777585 Merge branch 'loiteracceptance' into obcfailsafe 2014-09-05 10:11:28 +02:00
Thomas Gubler d7f93f4ece loiter mission items: better reached check for FW 2014-09-05 10:04:42 +02:00
Thomas Gubler 033e4892ca engine failure detection 2014-09-05 08:59:00 +02:00
Thomas Gubler faa221e6cb Merge remote-tracking branch 'private_swissfang/stable' into obcfailsafe 2014-09-04 21:11:07 +02:00
Thomas Gubler 9b2a40068a Merge remote-tracking branch 'private_swissfang/master' into stable 2014-09-04 20:32:14 +02:00
Thomas Gubler 2d5b2edc03 Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe 2014-09-04 20:28:25 +02:00
Thomas Gubler 3684bf71d5 make flare pitch angle a param 2014-09-04 18:12:20 +02:00