fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,383 Commits 852 Branches 161 Tags
Commit Graph

311 Commits

Author SHA1 Message Date
Anton Babushkin
fc1669b096 Merge branch master into dataman_state_nav_rewrite 2014-07-10 14:11:25 +02:00
Lorenz Meier
84b8e14d66 Merge pull request #1072 from PX4/forcesetpoint 
Force setpoint uorb topic
 2014-07-08 10:40:19 +02:00
Lorenz Meier
512584ed75 Merge pull request #1145 from DonLakeFlyer/MoreWarnings 
Fix compiler warnings
 2014-07-08 07:32:36 +02:00
Don Gagne
680ebf29c3 Fix compiler warnings 2014-07-07 15:11:46 -07:00
Anton Babushkin
9a69c7ba0e Merge branch 'master' into dataman_nav_drton 2014-07-07 15:09:16 +02:00
Julian Oes
79cbf15d26 Merge branch 'master' into offboard2_merge 
Conflicts:
	src/modules/commander/commander.cpp
 2014-07-07 14:49:58 +02:00
Anton Babushkin
bd5d3ebf70 telemetry_statur: use 4 separate topics 2014-07-06 16:08:37 +02:00
Anton Babushkin
39dab45ac5 Merge branch 'master' into dataman_state_nav_rewrite 2014-07-04 12:22:55 +02:00
Kynos
1cca3ca8a5 Use NAV-PVT with ubx7 and ubx8 modules 
This replaces NAV-SOL, NAV-POSLLH, NAV-VELNED and NAV-TIMEUTC.
 2014-07-03 13:33:29 +02:00
Thomas Gubler
722fe92425 Fix compile error: rename field in rc_channels.h 2014-07-02 16:45:42 +02:00
Julian Oes
73d6121a9d Merge branch 'master' into offboard2_merge 
Conflicts:
	src/modules/uORB/topics/rc_channels.h
 2014-07-02 15:15:26 +02:00
Julian Oes
fdceb8b062 Merge branch 'master' into navigator_rewrite_offboard2_merge 
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
	src/modules/mavlink/mavlink_receiver.cpp
 2014-07-02 14:59:43 +02:00
Lorenz Meier
a9fd5ed90a Merged master to gnss_rework 2014-07-02 00:33:36 +02:00
Lorenz Meier
45016b0df0 Merge pull request #984 from PX4/rc_channels 
rc_channels cleanup
 2014-06-30 17:11:14 +02:00
Anton Babushkin
1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Thomas Gubler
e8c34fa174 force setpoint uorb topic: add yaw field 2014-06-30 10:25:57 +02:00
Thomas Gubler
ffb0ebf13c Merge remote-tracking branch 'upstream/master' into forcesetpoint 
Conflicts:
	src/modules/uORB/objects_common.cpp
 2014-06-30 09:53:07 +02:00
Kynos
503ebddc1b Merged upstream master into gnss_rework branch 2014-06-30 01:34:12 +02:00
Lorenz Meier
154f14e747 Merged master into power_enforce 2014-06-30 00:50:38 +02:00
Lorenz Meier
afb5271bfb Merge branch 'master' of github.com:PX4/Firmware into navigator_rewrite_estimator 2014-06-29 19:27:03 +02:00
Lorenz Meier
ecee13861c Merged master 2014-06-29 19:12:35 +02:00
Lorenz Meier
94c69e11ae Merge pull request #1089 from PX4/navigator_rewrite 
Navigator rewrite
 2014-06-29 19:10:42 +02:00
Thomas Gubler
263a2fa9b2 mtecs: add flightpathangle filter 2014-06-29 14:52:09 +02:00
Thomas Gubler
7b15a424f0 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-28 16:52:27 +02:00
Julian Oes
faebf17514 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 14:41:38 +02:00
Julian Oes
b8d07532a7 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 14:41:19 +02:00
Julian Oes
cc8f7f4c97 Merge branch 'master' into navigator_rewrite 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.h
	src/modules/mavlink/mavlink_messages.cpp
 2014-06-27 14:39:36 +02:00
Julian Oes
332f03fa67 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 12:55:42 +02:00
Julian Oes
0b172d662a position_setpoint_triplet: add local position and velocity setpoints 2014-06-27 12:55:11 +02:00
Julian Oes
df9381636a offboard_control_setpoint: armed does not make sense there 2014-06-27 12:55:03 +02:00
Julian Oes
19fad94a34 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 11:02:47 +02:00
Anton Babushkin
9ae44291b1 navigator: added NAV_CMD_IDLE, added RTL_STATE_LOITER and RTL_STATE_LANDED instead of FINISHED 2014-06-27 00:27:08 +02:00
Lorenz Meier
0fe8ed509a Merge branch 'master' into power_enforce 2014-06-26 17:28:01 +02:00
Thomas Gubler
52d539d3cd extend integrator reset flags in uorb attitude setpoint topic to all axes 2014-06-24 17:39:48 +02:00
Thomas Gubler
3ddb502d2e force setpoint: fix comment 2014-06-24 14:14:13 +02:00
Thomas Gubler
88adeee669 define force setpoint uorb topic 2014-06-23 13:35:14 +02:00
Anton Babushkin
164f19176e Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-21 14:26:40 +02:00
Julian Oes
4e08457afe Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.cpp
	src/modules/mavlink/mavlink_receiver.cpp
	src/modules/mavlink/mavlink_receiver.h
	src/modules/uORB/topics/vehicle_status.h
 2014-06-20 18:18:39 +02:00
Julian Oes
c23bc93681 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-19 10:30:44 +02:00
Julian Oes
62faa2ee51 commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) 2014-06-19 10:26:56 +02:00
Julian Oes
eb1af6096e Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-19 09:28:23 +02:00
Julian Oes
e24925c743 commander: added some failsafe logic 2014-06-18 19:01:41 +02:00
Julian Oes
efd05d701a Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-18 14:14:50 +02:00
Anton Babushkin
55e5f747de commander: modes display fixes, don't activate failsafe while disarmed 2014-06-17 13:19:50 +02:00
Anton Babushkin
e0ed0625f8 commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions 2014-06-16 17:34:21 +02:00
Anton Babushkin
91f0b9eee4 mavlink: store last heartbeat time in telemetry_status topic 2014-06-16 17:32:58 +02:00
Kynos
137564b4a6 Merge master with the exception of ubx.cpp and ubx.h 2014-06-15 12:30:06 +02:00
Anton Babushkin
5be741607c mavlink: mission manager moved to separate class and reworked 2014-06-14 23:57:29 +02:00
Thomas Gubler
719779a07b Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator 2014-06-13 23:38:02 +02:00
Anton Babushkin
d84cbd008c Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-13 15:11:06 +02:00