fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-19 11:39:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:PX4/Firmware into paul_estimator

Browse Source
This commit is contained in:
Lorenz Meier 2014-03-05 22:02:04 +01:00
commit 3c5bcf77cc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/mc_att_control/mc_att_control_main.cpp
View File

@ -262,8 +262,10 @@ MulticopterAttitudeControl::MulticopterAttitudeControl() :
{
memset(&_v_att, 0, sizeof(_v_att));
memset(&_v_att_sp, 0, sizeof(_v_att_sp));
memset(&_v_rates_sp, 0, sizeof(_v_rates_sp));
memset(&_manual_control_sp, 0, sizeof(_manual_control_sp));
memset(&_v_control_mode, 0, sizeof(_v_control_mode));
memset(&_actuators, 0, sizeof(_actuators));
memset(&_armed, 0, sizeof(_armed));
_params.att_p.zero();

2
src/modules/px4iofirmware/mixer.cpp
View File

@ -327,7 +327,7 @@ mixer_handle_text(const void *buffer, size_t length)
return 1;
}
px4io_mixdata *msg = static_cast<px4io_mixdata *>(buffer);
px4io_mixdata *msg = (px4io_mixdata *)buffer;
isr_debug(2, "mix txt %u", length);