Commit Graph

124 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 9f1661f1f8 Silence FTP transactions, be vocal about errors 2014-07-08 09:58:08 +02: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
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
Anton Babushkin 1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Kynos 503ebddc1b Merged upstream master into gnss_rework branch 2014-06-30 01:34:12 +02:00
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
Lorenz Meier e00d9407b9 Merged master 2014-06-29 13:03:53 +02:00
Julian Oes faebf17514 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 14:41:38 +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 ee6e000098 mavlink: fix comment in swarm message receiver 2014-06-27 14:08:13 +02:00
Julian Oes 4c4d14347e mavlink: only save a offboard_control, don't publish to setpoint topics (let the navigator do this) 2014-06-27 12:54:52 +02:00
Julian Oes f5699e6490 mavlink: always copy offboard setpoints, not just when control mode changed, also bugfixes in orb calls 2014-06-27 12:53:44 +02:00
Lorenz Meier 6e597a66de merged master 2014-06-26 13:31:33 +02:00
Lorenz Meier 194aa49110 Merged rate config changes 2014-06-23 14:35:59 +02:00
Lorenz Meier 9a1b724070 Merged master 2014-06-22 18:21:03 +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 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
t0ni0 e078ef992f Removed publications closing
This is an attempt to correct the offboard setpoints being passed on as "NaN" values
2014-06-17 13:30:45 -04: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
Benjamin O'Connell-Armand 128ec447ad Fix various compilation issue 2014-06-14 15:50:21 -04:00
t0ni0 7d05f2df7c Added support for velocity setpoint in mavlink_receiver and mc_pos_control 2014-06-13 20:38:43 -04:00
Anton Babushkin 842e7c3df9 Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-12 16:51:37 +02:00
t0ni0 ca6463efd8 Modified mavlink receiver to scale offboard position and velocity messages to centimeters 2014-06-10 22:33:06 -04: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
t0ni0 2a79a9a4e4 Close fds when not needed
File descriptors get closed when not needed by offboard mode
to allow position and attitude controllers to advertise and publish.
2014-06-07 12:31:50 -04:00
andre-nguyen abbf57dac6 had the wrong variable and wrong setpoint type 2014-06-04 00:04:31 -04:00
Benjamin O'Connell-Armand 5c536ae46e Added processing of postion_control offboard messages (quad_swarm) 2014-06-02 23:10:03 -04:00
Kynos 9bad828bc0 U-blox driver rework, step 2
Moved satellite info from vehicle_gps_position_s into a new uORB topic
satellite_info.
Renamed satellites_visible to satellites_used to reflect true content.
sdlog2 will log info for GPS satellites only for now.
2014-05-30 14:30:25 +02: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
Anton Babushkin 78637ff74b mavlink: publish attitude / rates setpoint in offboard control mode 2014-05-21 11:14:06 +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