Commit Graph

5052 Commits

Author SHA1 Message Date
Thomas Gubler 993bf06eaf Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs 2013-11-09 11:06:53 +01:00
Thomas Gubler b172bcd912 fw pos ctrl: struct initialization 2013-11-08 21:27:16 +01:00
Thomas Gubler a1b80ec3f3 fw: att fix initialization and add parameter to disable coordinated turns at low speed 2013-11-08 21:27:00 +01:00
Thomas Gubler 668f9dc552 enable seatbelt without position lock for non rotary wing vehicles 2013-11-08 16:45:22 +01:00
Lorenz Meier c63995e91c Hotfix: Be more aggressive about SPI2 init on v1 boards 2013-11-08 14:22:27 +01:00
Lorenz Meier ea708915b9 Merge pull request #518 from PX4/hotfix_fixedwing_startup
Startup scripts: fixed stupid typo
2013-11-06 22:09:04 -08:00
Thomas Gubler 84fa1490de Merge remote-tracking branch 'upstream/hotfix_fixedwing_startup' into fw_autoland_att_tecs 2013-11-06 23:44:42 +01:00
Julian Oes 2af2bacc4f Startup scripts: fixed stupid typo 2013-11-06 23:41:15 +01:00
Thomas Gubler 8a62e2a452 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs' into fw_autoland_att_tecs 2013-11-06 23:24:33 +01:00
Thomas Gubler 9526f17f16 Merge branch 'fw_autoland' into fw_autoland_att_tecs 2013-11-06 23:21:28 +01:00
Thomas Gubler 6064a2af7e mavlink output instead of printf 2013-11-06 23:21:11 +01:00
Thomas Gubler 7f793d9753 mavlink output instead of printf 2013-11-06 23:20:04 +01:00
Julian Oes c75c5a5f30 Fixedwing: Enable loiter mode, tested in HIL 2013-11-06 23:11:14 +01:00
Thomas Gubler 9894751442 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 18:10:50 +01:00
Thomas Gubler 50a06e3d1e Merge remote-tracking branch 'upstream/fw_autoland' into fw_autoland 2013-11-06 18:08:41 +01:00
Thomas Gubler 6fc430bd39 parametrize some landing parameters 2013-11-06 18:08:30 +01:00
Thomas Gubler ae2739039d Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs 2013-11-06 18:07:55 +01:00
Thomas Gubler 2495001880 parametrize some landing parameters 2013-11-06 18:07:19 +01:00
Lorenz Meier e3770dab99 Merge pull request #517 from thomasgubler/hil_startupscripts
remove commander from hil startup scripts
2013-11-06 08:18:02 -08:00
Thomas Gubler 9b08923cd2 remove commander from hil startup scripts 2013-11-06 17:02:23 +01:00
Thomas Gubler dd5de28ed9 remove commander from hil startup scripts 2013-11-06 17:01:29 +01:00
Thomas Gubler c29fa61143 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs 2013-11-06 16:18:46 +01:00
Thomas Gubler e62d08a8fb Merge branch 'fw_autoland' into fw_autoland_att_tecs 2013-11-06 16:18:38 +01:00
Thomas Gubler f92e7cd8c7 land: fix logic before L to climb to L if last wp is below L 2013-11-06 16:18:18 +01:00
Thomas Gubler 50405f9c7c land: fix logic before L to climb to L if last wp is below L 2013-11-06 16:17:49 +01:00
Lorenz Meier c46995a81e Merge branch 'fw_autoland' of github.com:thomasgubler/Firmware_Private into fw_autoland 2013-11-06 15:13:55 +01:00
Thomas Gubler 8b69b1dcaf Merge branch 'fw_autoland' into fw_autoland_att_tecs 2013-11-06 15:10:20 +01:00
Thomas Gubler 020964c78a land motor lim independent of flare 2013-11-06 15:10:07 +01:00
Lorenz Meier b7535cf440 Merge branch 'master' of github.com:PX4/Firmware into fw_autoland 2013-11-06 15:10:07 +01:00
Lorenz Meier cd5bde2144 Merge pull request #515 from julianoes/startup_fixes
Startup script update
2013-11-06 06:09:46 -08:00
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
Julian Oes 4502c285eb Startup scripts: Start the commander early and let it try to open the mavlink_fd with 20Hz 2013-11-05 19:56:33 +01:00
Julian Oes 857c3d2efd Startup scripts: Corrected cases where commander was not started, updated several outdated scripts 2013-11-05 16:59:34 +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