Commit Graph

6285 Commits

Author SHA1 Message Date
Thomas Gubler b086bdf21e Merge remote-tracking branch 'upstream/master' into launchdetector
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-03-06 21:53:51 +01:00
Lorenz Meier 3207450037 Merge pull request #705 from helenol/helen_ardrone
Ardrone startup script
2014-03-06 17:08:27 +01:00
Anton Babushkin 25faf1b8f8 ardrone: minor fixes 2014-03-06 17:44:10 +04:00
Helen Oleynikova a897c97d95 Changed ARDRONE to an OUTPUT_MODE setting and added a skip option to mixer. Fewer beeps than before. 2014-03-06 12:45:10 +01:00
Anton Babushkin 36ba60d63c mc_att_control: hotfix, memset all structs to zeroes on start, fixes garbage in actuator controls 4..8 2014-03-05 20:03:21 +04:00
Helen Oleynikova bcdc8c9e1d Get rid of one set of beeps. 2014-03-05 16:16:10 +01:00
Helen Oleynikova 30665816f0 Added a newline at the end of file. 2014-03-05 15:11:41 +01:00
Helen Oleynikova 5976815f2b Fixed startup parameters. 2014-03-05 15:07:05 +01:00
Helen Oleynikova 9ffa5a665a Set the mavlink port settings back to ttyS1 by default. 2014-03-05 10:56:58 +01:00
Helen Oleynikova 1d9d24f605 Added flag for ARDrone interface. 2014-03-05 10:50:16 +01:00
Lorenz Meier fabef6c889 Revert "Fixed warning"
This reverts commit 3639c7ae91.
2014-03-04 22:52:34 +01:00
Lorenz Meier 86c80678ae Merge branch 'master' of github.com:PX4/Firmware 2014-03-04 21:36:15 +01:00
Lorenz Meier 3639c7ae91 Fixed warning 2014-03-04 21:36:09 +01:00
Andrew Tridgell 9817922bf9 FMUv2: switch debug console and 2nd GPS
this allows a normal GPS cable to be used for the 2nd GPS, making
dual-GPS setups easier
2014-03-04 19:33:16 +01:00
Helen Oleynikova 958f7597e7 Added actual ARDrone start up script. 2014-03-04 16:33:18 +01:00
Helen Oleynikova ea70e96756 Added ARDrone to autostart 2014-03-04 16:16:39 +01:00
Andrew Tridgell a7012a5418 tests: added "tests file2" filesystem test
this is useful for testing for filesystem corruption on cluster
boundaries
2014-03-04 09:01:30 +01:00
Anton Babushkin b76e26c5e5 commander: allow arming with safety enabled in HIL mode 2014-03-03 21:24:59 +04:00
Anton Babushkin 3674aae4a7 commander: ignore battery voltage in HIL mode 2014-03-03 21:19:56 +04:00
Thomas Gubler eb32c7198e Merge pull request #700 from PX4/fix_mission_dive
Fix mission dive
2014-03-03 15:28:49 +01:00
julianoes 49fe131019 Merge pull request #674 from PX4/safety_disarm
commander: disarm system when safety enabled
2014-03-03 10:59:51 +01:00
julianoes 72ae4a6dc7 Merge pull request #653 from PX4/fs_beep
Beeps and LED blinks cleanup, beep on RC failsafe added
2014-03-03 10:11:33 +01:00
julianoes 8b99062e66 Merge pull request #660 from PX4/rtl_heading
navigator: use bearing to home for RTL
2014-03-03 09:14:38 +01:00
julianoes 85247e3fdd Merge pull request #680 from PX4/ready_rtl_fix
navigator: forbid READY -> RTL transition
2014-03-02 21:22:16 +01:00
Lorenz Meier eee8ee9e0f Merge pull request #699 from PX4/beta_phantom
startup: phantom script was missing the default line
2014-03-02 08:17:38 -08:00
Anton Babushkin db157b68c2 mc_pos_control: remove some debug logs 2014-03-02 19:42:10 +04:00
Anton Babushkin f79aea89bc Merge branch 'inav_fs' into rtl_heading 2014-03-01 23:43:21 +04:00
Anton Babushkin d11235585c position_estimator_inav: log writing on NaN estimate fixed 2014-03-01 22:56:02 +04:00
Anton Babushkin e06263f76f position_estimator_inav: failsafe against NaN estimate 2014-03-01 22:43:56 +04:00
Julian Oes b264352c17 startup: phantom script was missing the default line 2014-03-01 15:47:09 +01:00
Julian Oes eac00a71ea navigator: don't enter AUTO_READY for fixedwing because we don't have a land detector yet 2014-03-01 11:05:07 +01:00
Julian Oes 2c337d9b45 Merge remote-tracking branch 'px4/master' into beta 2014-03-01 10:36:19 +01:00
julianoes 3dd3ba4637 Merge pull request #688 from PX4/sdlog2_fix
log corruption lseek workaround
2014-03-01 10:35:06 +01:00
Thomas Gubler f2b46389ee fw: reset landing and takeoff state if switched to manual 2014-02-28 21:42:41 +01:00
Anton Babushkin 4912a4af99 Merge branch 'beta' into ready_rtl_fix 2014-02-28 20:04:43 +04:00
Julian Oes 680f2dd417 Merge remote-tracking branch 'px4/master' into beta 2014-02-27 17:30:15 +01:00
julianoes 9b6f08dc7e Merge pull request #696 from PX4/top_fix
top: CPU % indication bug fixed
2014-02-27 17:29:01 +01:00
Anton Babushkin f818765008 top: CPU % indication bug fixed 2014-02-27 18:32:55 +04:00
Anton Babushkin a79eef05bc perf_counter: added include 2014-02-24 23:48:00 +04:00
Julian Oes 5ed5e04cb2 sdlog2: code style fixes broke compilation 2014-02-24 15:43:23 +01:00
Thomas Gubler d975bf1f85 Merge pull request #691 from PX4/gitignore_pydev
gitignore: ignore pydev project file created in eclipse
2014-02-24 15:39:18 +01:00
Julian Oes ba0bf456b9 gitignore: ignore pydev project file created in eclipse 2014-02-24 15:37:35 +01:00
Julian Oes 909e138182 l1_pos_control: fix stupid 'if not' mistake 2014-02-24 14:27:24 +01:00
Julian Oes 75c6706278 l1_pos_control: set gndspeed_undershoot to 0 in loiter 2014-02-24 14:19:57 +01:00
Julian Oes ab8ece3961 l1_pos_control: prevent NaNs for roll setpoint 2014-02-24 12:42:48 +01:00
Julian Oes 9bed1677bd Merge remote-tracking branch 'px4/beta' into fix_mission_dive
Conflicts:
	src/modules/navigator/navigator_main.cpp
2014-02-24 10:24:08 +01:00
Lorenz Meier e1f60e7709 Code style fixes (authors should be in the doxygen section), using lseek to attempt to work around log corruption 2014-02-23 12:53:20 -08:00
Lorenz Meier 20618a611b Fixed a number of compile warnings in mount tests. 2014-02-23 12:44:05 -08:00
Lorenz Meier b048eb5668 Merge pull request #686 from PX4/code_style
Replace single if lines with brackets in astyle
2014-02-23 11:48:06 -08:00
Thomas Gubler 17ec859758 Merge pull request #682 from thomasgubler/beta_fwautoland
Beta: fw autoland remove virtual waypoint
2014-02-23 20:29:21 +01:00