Commit Graph
334 Commits
Author SHA1 Message Date
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
Julian Oes 59ae8cc054 Merge branch 'navigator_rewrite' of github.com:PX4/Firmware into navigator_rewrite 2014-06-12 19:12:44 +02:00
Julian Oes d48a8bc073 navigator: renamed the different RTL states 2014-06-12 19:09:18 +02:00
Anton Babushkin 842e7c3df9 Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-12 16:51:37 +02:00
Thomas Gubler 214a8cab49 Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator 2014-06-11 23:23:54 +02:00
Thomas Gubler f4898b94c6 Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite 2014-06-11 23:20:59 +02:00
Thomas Gubler f9946c98a8 mtecs: filter airspeed 2014-06-11 21:03:27 +02:00
Lorenz Meier 578680135e introduce multi device support on uORB 2014-06-10 15:03:58 +02:00
Anton Babushkin cad0877f67 mavlink: waypoint manager fixes, mission saving on reboot 2014-06-09 16:10:24 +02:00
Kynos 9f754e0e9a U-blox driver rework, step 3
More sat info isolation
Flush input after changing baudrate to allow driver restart w/o GNSS
module restart
2014-06-08 14:05:35 +02:00
Julian Oes e70604ea95 Merge remote-tracking branch 'px4/mtecs_estimator' into navigator_rewrite_estimator
Conflicts:
	src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
2014-06-07 13:15:44 +02:00
Julian Oes 078eed41af Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite 2014-06-06 23:16:39 +02:00
Lorenz Meier cb246a79ca Added vision position estimate topic 2014-06-05 16:47:16 +02:00
Lorenz Meier 7a6d33ba47 Extend estimator status 2014-06-04 09:51:14 +02:00
Julian Oes 34731a4f4e Merge branch 'mtecs' into navigator_rewrite 2014-06-03 16:29:32 +02:00
Julian Oes d1d03c34b9 Merge remote-tracking branch 'px4/master' into navigator_rewrite
Conflicts:
	src/modules/navigator/navigator_main.cpp
2014-06-03 16:04:39 +02:00
Julian Oes 854bb7fe08 navigator: mission class added (WIP) 2014-06-03 16:01:28 +02:00
Lorenz Meier bc24691de2 Merge branch 'mtecs' into mtecs_wind_estimate 2014-06-01 15:37:27 +02:00
Lorenz Meier fecbebc5a6 Merge branch 'master' of github.com:PX4/Firmware into mtecs 2014-06-01 15:37:14 +02:00
Lorenz Meier ad811304c8 actuator_armed: Fixed comments and doxygen, no C-level changes 2014-06-01 15:36:26 +02:00
Lorenz Meier ff4aec6588 wind estimate: added uORB topic 2014-06-01 15:34:27 +02:00
Thomas Gubler 33356ed503 mtecs publish state 2014-05-30 19:36:06 +02: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 ed6c2a5168 commander and navigator: lot's of changes, failsafe handling in commander, navigator only for execution (WIP) 2014-05-27 21:56:32 +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 55ad5588a8 system status topic: Add support for circuit breaker 2014-05-25 20:35:16 +02:00
Lorenz Meier c7bf00562d commander: Enforce (in presence of power sensing) that a) system is not purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail 2014-05-25 08:22:54 +02:00
Thomas Gubler 56ac13aafb introduce tecs status uorb message 2014-05-24 18:04:38 +02:00
Lorenz Meier 4f26a8b7c8 gps topic: Added snr and jamming fields 2014-05-23 15:02:51 +02:00
Lorenz Meier 7255aafcb5 Better docs in GPS topic 2014-05-23 13:00:22 +02:00