Commit Graph

5020 Commits

Author SHA1 Message Date
Thomas Gubler f2fdfd11b8 land motor lim independent of flare 2013-11-06 15:09:15 +01:00
Thomas Gubler 6f55ba9014 Merge remote-tracking branch 'upstream/fw_autoland' into fw_autoland_att_tecs 2013-11-06 14:52:40 +01:00
Lorenz Meier 56aa8c7e8d Minor fixes for motor off case 2013-11-06 14:43:29 +01:00
Thomas Gubler cc219b8728 Merge branch 'fw_autoland' into fw_autoland_att_tecs
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2013-11-06 13:13:10 +01:00
Thomas Gubler 7ad907e638 introduce experimental flare trajectory 2013-11-06 13:11:05 +01:00
Thomas Gubler bdbe64026b introduce experimental flare trajectory 2013-11-06 13:10:14 +01:00
Thomas Gubler a34252d18f experiment with landing slope hight for more exact landing 2013-11-05 16:50:46 +01:00
Thomas Gubler dbee676367 experiment with landing slope hight for more exact landing 2013-11-05 16:49:54 +01:00
Thomas Gubler c0285ae815 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs
Conflicts:
	src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp
	src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
	src/modules/fw_att_control/fw_att_control_main.cpp
2013-11-05 15:56:49 +01:00
Lorenz Meier 4beca20de2 Merge branch 'master' into fw_autoland 2013-11-05 09:28:00 +01:00
Lorenz Meier d3b267c06e Integral fixes, last parts 2013-11-05 09:20:07 +01:00
Lorenz Meier d7064884db Merge branch 'master' into fw_autoland
nored, and an empty message aborts
2013-11-05 08:42:20 +01:00
Lorenz Meier 5a5d758ce4 Merge branch 'fw_autoland' of github.com:thomasgubler/Firmware_Private into fw_autoland 2013-11-05 08:42:15 +01:00
Lorenz Meier 1358d4cb88 Hotfix: Fix integrator parameters 2013-11-05 07:44:16 +01:00
Lorenz Meier ed60dc50fc Hotfix: forbid integrator to accumulate NaN values if they ever would occur 2013-11-05 07:43:08 +01:00
Thomas Gubler c96a2eac6d Merge branch 'fw_att_master' into fw_autoland_att_tecs 2013-11-04 13:19:12 +01:00
Thomas Gubler c4b994d4ca remove unnecessary printf 2013-11-04 13:19:01 +01:00
Thomas Gubler 22dbc03c01 remove unnecessary printf 2013-11-04 13:18:20 +01:00
Thomas Gubler c8bc5861cf Merge branch 'fw_att_master' into fw_autoland_att_tecs 2013-11-04 13:15:14 +01:00
Thomas Gubler 303ceab6ed fw: make att controller more robust against invalid (nan) setpoints 2013-11-04 13:14:59 +01:00
Thomas Gubler 014e856c1f fw: make att controller more robust against invalid (nan) setpoints 2013-11-04 13:14:25 +01:00
Thomas Gubler 9349509302 Merge branch 'fw_att_master' into fw_autoland_att_tecs 2013-11-03 22:06:26 +01:00
Thomas Gubler 3b1086b879 fix initialization of attitude controllers 2013-11-03 22:05:58 +01:00
Thomas Gubler a641296546 Merge remote-tracking branch 'upstream/master' into fw_att_master 2013-11-03 22:05:33 +01:00
Thomas Gubler 89b8acd7a8 fix initialization of attitude controllers 2013-11-03 22:04:32 +01:00
Thomas Gubler 4db049144f Merge branch 'fw_autoland' into fw_autoland_att_tecs 2013-11-03 20:44:56 +01:00
Thomas Gubler 9d5f422d24 fix land_noreturn logic 2013-11-03 20:44:12 +01:00
Thomas Gubler e5fbf3bc51 Merge branch 'fw_autoland' into fw_autoland_att_tecs 2013-11-03 20:34:22 +01:00
Thomas Gubler 937b502d4c increase landing speed to v_min * 1.3 for more safety 2013-11-03 20:33:56 +01:00
Thomas Gubler fa4533e359 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs 2013-11-03 18:38:34 +01:00
Lorenz Meier 3042731d26 Smaller hotfixes for att pos estimator 2013-11-03 18:27:26 +01:00
Lorenz Meier 791695ccd0 Hotfix: Check for out of range accel values 2013-11-03 18:26:39 +01:00
Lorenz Meier b53d86ed68 Hotfix for mag calibration 2013-11-03 18:26:02 +01:00
Lorenz Meier 8d4ec9b9cd Merge branch 'master' of github.com:PX4/Firmware 2013-11-03 18:17:05 +01:00
Lorenz Meier ba0687bc5e Matrix and Vector printing cleanup 2013-11-03 18:06:58 +01:00
Lorenz Meier bfbdc445fb Merge pull request #509 from PX4/orb_fix
Orb fix
2013-11-03 08:59:57 -08:00
Lorenz Meier 4865814f92 Fixed typo, added testing - previous corner case now cleanly prevented 2013-11-03 17:58:28 +01:00
Lorenz Meier 98f5a77574 Fix to cancel pending callbacks for closing ORB topics 2013-11-03 17:52:27 +01:00
Thomas Gubler a4c99225c0 initialize _vel_dot and _STEdotErrLast 2013-11-03 17:17:45 +01:00
Thomas Gubler 1aef7c502c Merge branch 'fw_autoland' into fw_autoland_att_tecs 2013-11-03 15:30:38 +01:00
Thomas Gubler 3b76959df5 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs 2013-11-03 12:12:28 +01:00
Lorenz Meier 64c2165e8b Merge pull request #507 from thomasgubler/airspeed_poll
fix vehicle_airspeed_poll logic
2013-11-02 10:35:38 -07:00
Thomas Gubler ef7a425a45 fix vehicle_airspeed_poll logic: _tecs.enable_airspeed was not called before on valid airspeed 2013-11-02 17:33:45 +01:00
Lorenz Meier 2b2a85b75f Merge pull request #506 from thomasgubler/tecs_airspeedmax_param_fix
fix usage of wrong value for max airspeed parameter
2013-11-02 09:19:11 -07:00
Thomas Gubler 18cfc383e8 Merge branch 'tecs_airspeedmax_param_fix' into fw_autoland_att_tecs 2013-11-02 16:19:10 +01:00
Thomas Gubler 3eac9ce159 fix usage of wrong value for max airspeed parameter 2013-11-02 16:16:49 +01:00
Thomas Gubler 5fec5fecdc change flare pitch setpoint 2013-11-02 15:13:03 +01:00
Thomas Gubler 51756e1a87 Merge branch 'fw_autoland' into fw_autoland_att_tecs 2013-11-02 13:53:50 +01:00
Thomas Gubler 4b2e08a850 autoland, fix flare and max landing throttle 2013-11-02 13:53:30 +01:00
Thomas Gubler 7d75d020a7 Merge branch 'fw_autoland' into fw_autoland_att_tecs
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c
2013-11-01 17:39:06 +01:00