fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-15 00:40:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,854 Commits 852 Branches 161 Tags
72071cdcd39cae6be8533e67d01cbc7533ca6cb1
Commit Graph

95 Commits

Author SHA1 Message Date
Lorenz Meier ecee13861c Merged master 2014-06-29 19:12:35 +02:00
Lorenz Meier 5db51bd704 Merged master into navigator_rewrite 2014-06-29 13:11:29 +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
Lorenz Meier 6e597a66de merged master 2014-06-26 13:31:33 +02:00
Anton Babushkin 164f19176e Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-21 14:26:40 +02:00
Julian Oes e0c78e51e3 mavlink: only publish telemetry status from GCS 2014-06-19 14:14:24 +02:00
Julian Oes 94e004955d mavlink: publish telemtry status without radio status 2014-06-19 09:33:28 +02:00
Anton Babushkin 91f0b9eee4 mavlink: store last heartbeat time in telemetry_status topic 2014-06-16 17:32:58 +02:00
Anton Babushkin 5be741607c mavlink: mission manager moved to separate class and reworked 2014-06-14 23:57:29 +02:00
Anton Babushkin 842e7c3df9 Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-12 16:51:37 +02:00
Anton Babushkin fb4bcf87ba Merge branch 'master' into mavlink_stack 2014-06-10 15:12:09 +02:00
Lorenz Meier a103fef948 Fixed threading and transmission issues for FTP 2014-06-08 18:51:35 +02:00
px4dev 5d7ea2bdab Merge branch 'master' into mavlink-ftp 2014-06-07 10:54:17 -07:00
Julian Oes 063caba36b Merge branch 'master' into navigator_rewrite 
Conflicts:
	src/drivers/gps/gps.cpp
	src/drivers/gps/mtk.cpp
	src/modules/commander/commander.cpp
	src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
	src/modules/navigator/mission.cpp
	src/modules/navigator/mission.h
	src/modules/navigator/navigator_main.cpp
	src/modules/navigator/navigator_state.h
	src/modules/position_estimator_inav/position_estimator_inav_main.c
 2014-05-26 20:19:11 +02:00
Lorenz Meier c60561b705 mavlink: Compile warning fixes 2014-05-21 14:21:47 +02:00
Lorenz Meier fbb3adde06 mavlink app: Clean up allocations 2014-05-16 14:00:58 +02:00
Lorenz Meier cccd3e1dc4 mavlink app: Reduce stack sizes minimally after further inspection 2014-05-16 10:47:18 +02:00
Thomas Gubler 08002fbc15 mavlink receiver: use new manual control setpoint variable names 2014-05-12 09:23:20 +02:00
Julian Oes 26f5e550c4 Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params 
Conflicts:
	src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp
 2014-05-07 21:11:21 +02:00
Lorenz Meier 1d6b9fae03 Fix in-air restarts, protect against an external MAVLink sender exploiting the restart mechanism 2014-05-06 14:57:06 +02:00
px4dev 12390d7281 WIP: Mavlink file server 2014-05-04 11:19:26 -07:00
Anton Babushkin f6d61dfb4c mavlink: swap x and y when handling MANUAL_CONTROL mavlink message 2014-05-01 23:45:21 +02:00
Julian Oes e882824ee1 eph and epv renaming, make this compile again 2014-04-26 23:31:15 +02:00
Anton Babushkin 0c1de81785 Merge branch 'master' into mpc_rc 2014-04-25 21:39:59 +02:00
Thomas Gubler d7d6a3d3b7 filter gps simulation hil gps message with sysid 2014-04-23 16:26:44 +02:00
Thomas Gubler a2940182ef add parameter to mavlink app to allow parsing of HIL GPS message even if not in HIL mode 
Conflicts:
	src/modules/mavlink/mavlink_receiver.cpp
 2014-04-23 15:53:48 +02:00
Anton Babushkin 8634780e80 Merge branch 'master' into mpc_rc 2014-04-20 20:10:39 +02:00
Anton Babushkin 88149311ea Merge branch 'rc_timeout' into mpc_rc 2014-04-13 11:06:49 +04:00
Helen Oleynikova 8a946f0320 More whitespace all the time. 2014-04-10 10:37:58 +02:00
Helen Oleynikova e6542653b9 Finished adding a '-w' option. 2014-04-10 10:26:15 +02:00
Julian Oes fc2bfb828f Merge remote-tracking branch 'px4/master' into mavlink_broadcast 2014-04-07 21:45:45 +02:00
Anton Babushkin c77a7b1162 mavlink_receiver: don't publish rc_channels on manual_control from mavlink, set switches to unmapped state instead of using previous values 2014-04-06 22:23:33 +04:00
Anton Babushkin 7c4f1c90dc mavlink_receiver: fixed bug in manual control publication, minor refactoring 2014-04-06 14:57:45 +04:00
Julian Oes f17c0b1335 mavlink: implemented multicasting between mavlink instances (two options: forwarding: forward received messages from self to other mavlink instances, passing: send out messages received from other mavlink intances over serial 2014-04-03 21:15:47 +02:00
Anton Babushkin a991ebd8ca Merge branch 'master' into mpc_local_pos 2014-03-28 10:44:28 +04:00
Anton Babushkin 83da4ae02d 'vehicle_global_position' topic updated: removed baro_alt and XXX_valid flags. 2014-03-27 00:27:11 +04:00
Lorenz Meier 57fdb40a4e mavlink: Hotfixed HIL battery status publication 2014-03-23 16:57:01 +01:00
Anton Babushkin 712c72d25b Optical flow fixes 2014-03-21 12:52:27 +04:00
Anton Babushkin 9b71e660ad Merge branch 'beta_mavlink2' into mpc_local_pos_mavlink 2014-03-19 20:01:01 +04:00
Anton Babushkin c266124099 vehicle_local_position: use double for ref_lat and ref_lon instead of int32, fix related apps 2014-03-17 23:58:00 +04:00
Anton Babushkin 3d5f52678f Use updated map_projection_XXX functions in apps 2014-03-17 22:20:41 +04:00
Lorenz Meier 75ad1c4a13 Completely and properly populate battery status message in HIL 2014-03-17 14:35:07 +01:00
Lorenz Meier 8cb5a12cc7 Remove now unused hil_counter 2014-03-17 13:33:23 +01:00
Lorenz Meier 3874bca208 mavlink: Only send messages when we have updates for them. 2014-03-16 13:48:33 +01:00
Lorenz Meier 76af0970f5 Increased param rate, fixed wrong usage of MAVLink chan. 2014-03-12 09:46:02 +01:00
Anton Babushkin 9e41f6af18 mavlink: memory leaks on exit fixed, minor fixes 2014-03-11 19:28:48 +04:00
Anton Babushkin b3839afbbc mavlink: channel ID allocation fixed 2014-03-11 11:12:39 +04:00
Anton Babushkin 2ec4ee6fc0 mavlink_receiver: split message handlers to separate methods 2014-03-04 13:02:45 +04:00
Anton Babushkin 3107f4d62c mavlink: UART receiver major cleanup 2014-03-04 00:26:26 +04:00
Anton Babushkin 63bdb749ad mavlink: unused include removed 2014-03-01 22:41:27 +04:00