Commit Graph

2915 Commits

Author SHA1 Message Date
Julian Oes 03d87c2660 Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_home_init
Conflicts:
	src/drivers/gps/gps.cpp
2014-04-27 11:41:34 +02:00
Julian Oes 721c90291c commander: some HIL commands and land detector cleanup 2014-04-27 02:26:09 +02:00
Julian Oes a6f71f10d0 fw_att_pos_estimator: some tuning for the land/in-air detector 2014-04-27 02:24: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 6ab878c021 Emit the local position against the GPS reference - this means it can jump. 2014-04-26 18:38:37 +02:00
Lorenz Meier 925430796e Reworked how we deal with altitudes 2014-04-26 18:37:26 +02:00
Lorenz Meier 6612cdab85 Let commander be less pedantic about positioning data 2014-04-26 18:36:09 +02:00
Lorenz Meier 18a932fe94 Better fake / simulation values 2014-04-26 18:35:22 +02:00
Lorenz Meier 2d978beefb Compile fixes 2014-04-26 16:16:44 +02:00
Lorenz Meier 13dfe0447c Send current local position estimate as well 2014-04-26 16:07:29 +02:00
Lorenz Meier 0d50b3ea86 Fix struct inits 2014-04-26 16:06:25 +02:00
Lorenz Meier 9358eb2428 Fixed string formatting error 2014-04-26 15:22:03 +02:00
Lorenz Meier 5ad3ff95bf Merged master into ekf_params 2014-04-26 15:19:21 +02:00
Lorenz Meier ad1be765bf Fix warnings, use more efficient atan2f where it can be safely used 2014-04-26 15:14:23 +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
Julian Oes ea0142810a navigator: comments and whitespace 2014-04-26 12:55:27 +02:00
Julian Oes 9f857f86e4 navigator: corrected the RTL waypoint types 2014-04-26 12:24:52 +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
Lorenz Meier 5bd8e6f6b3 Merge pull request #845 from PX4/mag_decl_hotfix
Mag declination hotfix
2014-04-26 12:23:48 +02:00
Lorenz Meier eb520e7dcd Merge pull request #849 from PX4/compile_pedantic
Compile pedantic
2014-04-26 12:22:13 +02:00
Julian Oes db5266d3df Merge remote-tracking branch 'px4/master' into navigator_cleanup 2014-04-26 11:59:33 +02:00
Julian Oes 3411d58dfc Merge branch 'navigator_cleanup' of github.com:PX4/Firmware into navigator_cleanup 2014-04-26 11:44:09 +02:00
Julian Oes c0d4ecf2b6 navigator: some warnings and cleanup 2014-04-26 11:42:46 +02:00
Anton Babushkin 84943644d7 mc_pos_control: parameters comments minor fixes 2014-04-25 23:06:32 +02:00
Anton Babushkin a432ed4900 mc_pos_control: convert tilt_max to degrees 2014-04-25 22:53:48 +02:00
Anton Babushkin 2453b354fa Failsafe landing without position control fixed 2014-04-25 22:26:51 +02:00
Anton Babushkin 0c1de81785 Merge branch 'master' into mpc_rc 2014-04-25 21:39:59 +02:00
Lorenz Meier f0298e005a Merge pull request #852 from PX4/sensors_loop
sensors: Keep looping in sensors app even if gyros do not update any mor...
2014-04-25 16:52:53 +02:00
Thomas Gubler 437825a5a8 launchdetector: fix copyright header 2014-04-25 16:39:16 +02:00
Lorenz Meier 5ef57b8af6 Merge pull request #843 from PX4/sensor_err_handling
Sensor error handling
2014-04-25 10:14:08 +02:00
Anton Babushkin 22aaae197b Merge branch 'rc_timeout' into mpc_rc 2014-04-24 22:40:46 +02:00
Anton Babushkin 63c50676f9 MISSION switch renamed to LOITER 2014-04-24 22:38:19 +02:00
Anton Babushkin db474072a7 Merge branch 'rc_timeout' into mpc_rc 2014-04-23 19:03:03 +02:00
Anton Babushkin 56592ec77d commander: don't start RTL on failsafe if landed 2014-04-23 19:01:05 +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 34597599fc navigator: merging bug fixed 2014-04-23 15:26:24 +02:00
Anton Babushkin dc8a0b291a Merge branch 'mpc_local_pos' into mpc_rc 2014-04-23 15:25:13 +02:00
Anton Babushkin 320c97c498 navigator: check if mission reached on vehicle_status updates 2014-04-23 15:24:45 +02:00
Anton Babushkin 2998685a3a Merge branch 'mpc_local_pos' into mpc_rc 2014-04-23 14:22:52 +02:00
Anton Babushkin 60554c8a56 navigator: publish global_position_setpoint on vehicle_status updates 2014-04-23 14:15:59 +02:00
Anton Babushkin a1cf8801bb sdlog2: add failsafe state logging 2014-04-22 11:36:25 +02:00
Anton Babushkin e4a4430f9f Merge branch 'master' into rc_timeout 2014-04-22 11:18:07 +02:00
Anton Babushkin 302233a34f Merge branch 'master' into mpc_local_pos 2014-04-22 11:13:11 +02:00
Julian Oes fd56c15a20 Merge remote-tracking branch 'px4/master' into navigator_cleanup
Conflicts:
	ROMFS/px4fmu_common/init.d/rcS
	src/modules/mavlink/mavlink_main.cpp
	src/modules/mavlink/mavlink_messages.cpp
	src/modules/mavlink/module.mk
	src/modules/sdlog2/sdlog2_messages.h
2014-04-22 11:10:48 +02:00
Lorenz Meier a30411e9f2 Fixed printing in attitude control 2014-04-22 11:02:53 +02:00
Lorenz Meier 4585df1182 Robustified filter init / sequencing 2014-04-22 11:02:31 +02:00
Lorenz Meier 1e80e62491 ekf: Better variable zeroing 2014-04-22 10:26:44 +02:00