Commit Graph

311 Commits

Author SHA1 Message Date
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
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 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
Anton Babushkin 950571eaf6 Merge branch 'master' into offboard2 2014-05-21 10:40:58 +02:00
Anton Babushkin e92620b9b2 rc_channels topic cleanup 2014-05-20 23:15:58 +02:00
Lorenz Meier 639d86eab2 Merge pull request #979 from PX4/acro2
ACRO mode
2014-05-20 08:36:49 -07:00
Anton Babushkin b12928548c Merge branch 'master' into acro2 2014-05-20 00:03:00 +02:00
Anton Babushkin 692e8f84a9 commander: don't require good EPH for local_position_valid, position_estimator_inav: estimate EPH/EPV and publish it in local position topic 2014-05-16 22:12:07 +02:00
Anton Babushkin 8c4b35cc23 Merge branch 'master' into offboard2 2014-05-16 12:12:43 +02:00
Thomas Gubler 15699549a2 manual control setpoint: add comment about sign 2014-05-12 13:35:11 +02:00
Thomas Gubler 7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/uORB/topics/manual_control_setpoint.h
2014-05-12 09:39:52 +02:00
Thomas Gubler d9333a1993 manual control setpoint: rename variables 2014-05-12 09:20:40 +02:00
Anton Babushkin c131e4cada manual_control_setpoint: comments fixed 2014-05-11 23:46:12 +02:00
Anton Babushkin 88b18bbad1 ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL 2014-05-11 13:35:05 +02:00
Anton Babushkin 808badb34d Use "POSCTL" switch name consistently 2014-05-11 12:54:15 +02:00
TickTock- 31089a290b Replaces poshold/althold with posctrl/altctrl 2014-04-28 21:47:45 -07:00
TickTock- 269800b48c renamed EASY to POSHOLD and SEATBELT to ALTHOLD 2014-04-27 14:06:00 -07:00
TickTock- 6a7b104c2b compiles 2014-04-27 13:12:28 -07:00
TickTock- 07c35010aa Merged in upstream master 2014-04-27 12:43:13 -07:00
Lorenz Meier c74248c8b1 Merged mpc_rc with master 2014-04-27 15:45:33 +02:00
Julian Oes e882824ee1 eph and epv renaming, make this compile again 2014-04-26 23:31:15 +02:00
Julian Oes e8531e8360 Merge remote-tracking branch 'px4/ekf_home_init' into navigator_cleanup_ekf_home_init
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/mc_pos_control/mc_pos_control_main.cpp
	src/modules/navigator/navigator_main.cpp
	src/modules/uORB/topics/vehicle_global_position.h
2014-04-26 23:08:11 +02:00
Lorenz Meier 13dfe0447c Send current local position estimate as well 2014-04-26 16:07:29 +02:00
Lorenz Meier 22d3bcdab6 Merged mpc_rc into ekf_params 2014-04-26 15:13:03 +02:00
Julian Oes 3a12cb4648 Merge remote-tracking branch 'px4/master' into navigator_cleanup 2014-04-26 12:56:18 +02:00
Lorenz Meier 4a949a9565 Merge pull request #749 from DonLakeFlyer/ArmDisarm
Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM
2014-04-26 12:24:42 +02:00