145 Commits

Author SHA1 Message Date
Julian Oes
30dacbd154 Mavlink and navigator: handle current waypoint onboard 2014-02-15 11:29:36 +01:00
Julian Oes
3462054f73 Merge remote-tracking branch 'px4/beta' into beta_mavlink
Conflicts:
	src/modules/mavlink/mavlink.c
	src/modules/mavlink/mavlink_receiver.h
	src/modules/mavlink/orb_listener.c
2014-02-12 17:10:20 +01:00
Anton Babushkin
179aa17a38 sdlog2: TELE (telemetry status) message added, type for 'rssi' and 'remote_rssi' in 'telemetry_status' topic fixed to be consistent with 'noise'/'remote_noise' and mavlink message. 2014-02-12 12:21:23 +01:00
Julian Oes
ea2a69d8bf Mavlink: get orb_listener to work 2014-02-11 22:36:36 +01:00
Lorenz Meier
020e7dcae3 Merged master into beta 2014-02-01 19:13:13 +01:00
Lorenz Meier
c1d1d67534 Improved RC calibration behaviour, fully supported setting trim offsets 2014-02-01 13:22:52 +01:00
Anton Babushkin
591b355981 setpoint type IDLE added (for AUTO_READY state), LAND mode fixed 2014-01-29 14:39:36 +01:00
Anton Babushkin
6a1a29f77e global_position topic: added baro_alt, mc_pos_control: SEATBELT mode fixed, use baro/AMSL alt 2014-01-28 20:40:05 +01:00
Lorenz Meier
9c355d280e Merged beta into mavlink rework branch 2014-01-28 15:13:14 +01:00
Anton Babushkin
3fdb082cb8 mavlink: AUTO states indication fixed 2014-01-28 00:03:29 +01:00
Anton Babushkin
d1508a7813 vehicle_control_mode publication moved to commander, WIP 2014-01-27 20:49:17 +01:00
Anton Babushkin
c7f0553938 cammander: state machine can now deny current state (e.g. when position lock lost during EASY mode), added FAILSAFE_STATE_LAND 2014-01-26 11:50:34 +01:00
Anton Babushkin
92ddf7903b commander: more user-friendly states indication 2014-01-25 23:37:26 +01:00
Anton Babushkin
ebc7cb03b7 «flighttermination state» replaced by more general «failsafe state» 2014-01-25 23:24:12 +01:00
Anton Babushkin
58792c5ca6 Use double for lat/lon in vehicle_global_position topic, use filed names lat, lon, alt, vel_n, vel_e, vel_d for global positions 2014-01-24 00:06:10 +01:00
Anton Babushkin
1cffa9d2f7 position_setpoint_triplet refactoring finished 2014-01-23 22:41:26 +01:00
Anton Babushkin
6acb8fa66f Replace mission_item_triplet with position_setpoint_triplet, WIP 2014-01-23 12:16:02 +01:00
Anton Babushkin
2e472cf918 attitude_estimator_ekf: acc comp bug fixed, estimated gravity vector logging 2014-01-20 23:44:04 +01:00
Anton Babushkin
97e4522c76 Merge branch 'master' into navigator_new_vector 2014-01-14 15:45:49 +01:00
Lorenz Meier
9b711d6a72 Merged origin/master into batt_fixes 2014-01-07 15:34:13 +01:00
Anton Babushkin
2dc2c2d28f Merge branch 'navigator_new' into navigator_new_vector 2014-01-02 21:57:33 +04:00
Anton Babushkin
220011914c navigator: AUTO_READY nav state added, RTL implemented properly 2014-01-02 21:57:01 +04:00
Anton Babushkin
5bedd8c714 Merge branch 'navigator_new' into navigator_new_vector 2014-01-02 14:52:00 +04:00
Anton Babushkin
74e2542c07 navigator: takeoff and mission fixes 2014-01-02 14:49:34 +04:00
Anton Babushkin
61ef2e00a9 Merge branch 'navigator_new' into navigator_new_vector 2014-01-01 23:21:45 +04:00
Anton Babushkin
3c72c9bf7f navigator: force takeoff if first mission item is not takeoff and vehicle landed 2014-01-01 23:21:29 +04:00
Anton Babushkin
549fd4f0e8 Merge branch 'navigator_new' into navigator_new_vector 2013-12-31 19:31:16 +04:00
Anton Babushkin
7f9a7ffe82 navigator: MISSION_LOITER and RTL_LOITER modes removed 2013-12-31 19:30:41 +04:00
Anton Babushkin
ba7cbe48f2 Merge branch 'navigator_new' into navigator_new_vector 2013-12-31 12:50:11 +04:00
Anton Babushkin
d35a169907 navigator: NAV_STATE_INIT removed, minor fixes 2013-12-31 12:46:35 +04:00
Anton Babushkin
6c30eebeb8 Merge branch 'navigator_new' into navigator_new_vector 2013-12-30 14:42:00 +04:00
Anton Babushkin
33385a783c Added NONE = not mapped state for mission and return switches 2013-12-30 14:04:24 +04:00
Anton Babushkin
a71b04775c Merge commit '95bdc1a9bd364ce95abe06b097579cc8a9162e33' into navigator_new_vector 2013-12-30 08:55:26 +04:00
Julian Oes
ea55527bbb Waypoints and missionlib: lot's of cleanup 2013-12-29 14:50:26 +01:00
Anton Babushkin
7e29028429 Moving nav state from commander to navigator, WIP 2013-12-29 12:16:49 +04:00
Anton Babushkin
7b7539fbbd Merge branch 'navigator_new' into navigator_new_vector, WIP 2013-12-28 10:04:13 +04:00
Julian Oes
32c7aea2a6 Home position: use double for lat/lon and float for altitude, set home position to global position instead of GPS position once we have a fix 2013-12-27 11:07:45 +01:00
Julian Oes
677150388f Merge remote-tracking branch 'thomasgubler_private/fw_autoland_att_tecs_navigator_termination_controlgroups' into navigator_new 2013-12-27 10:48:04 +01:00
Julian Oes
1c7e07d8d7 Topics: Move from global_position_setpoint to mission_item_triplet 2013-12-26 21:41:54 +01:00
Julian Oes
409fa12c4e Mission topic: corrected comment 2013-12-26 15:17:44 +01:00
Thomas Gubler
b02b48290f Navigator: add MissionFeasibilityChecker class; performs validation of landing waypoint set-up for fixed wing for now, but can be extended for other checks (e.g. check mission against geofence) 2013-12-25 17:10:38 +01:00
Julian Oes
b10fa3d047 Waypoints/Navigator: Use two different dataman storage places, keep old waypoints until all new ones are written 2013-12-25 11:23:58 +01:00
Thomas Gubler
b7652986d9 add minimal pitch field to mission item 2013-12-23 13:40:56 +01:00
Thomas Gubler
1450903fa9 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/modules/navigator/navigator_main.cpp
2013-12-23 11:47:17 +01:00
Thomas Gubler
68d8230e78 Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/systemcmds/tests/module.mk
	src/systemcmds/tests/tests.h
2013-12-23 11:13:42 +01:00
Anton Babushkin
f36ffe0859 Partially merge branch 'inav_alt_gps' into vector_control2, only estimator part 2013-12-23 11:13:08 +04:00
Lorenz Meier
9abf31c2ba Support 18 channels correctly on FMU 2013-12-22 21:09:47 +01:00
Julian Oes
bed40c962e Navigator: handle onboard and mavlink missions 2013-12-16 17:12:46 +01:00
Thomas Gubler
c3cbaf5deb Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/drivers/px4io/px4io.cpp
2013-12-13 21:07:27 +01:00
Anton Babushkin
6d40f90cc1 Merge branch 'mavlink_fixes' into vector_control2 2013-12-13 17:44:42 +04:00