fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 14:33:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolved shared memory parameter problems and removed additional debug code.

Browse Source
This commit is contained in:
jwilson
2016-02-19 16:59:49 +01:00
committed by Julian Oes
parent d84639f8c4
commit 4adfea7fa9
4 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mc_att_control/mc_att_control_main.cpp
-15
View File
@@ -839,9 +839,6 @@ MulticopterAttitudeControl::task_main()
continue;
}
// TODO-JYW: TESTING-TESTING:
warnx("_ctrl_state_sub is producing data");
/* this is undesirable but not much we can do - might want to flag unhappy status */
if (pret < 0) {
warn("mc att ctrl: poll error %d, %d", pret, errno);
@@ -887,9 +884,6 @@ MulticopterAttitudeControl::task_main()
}
}
// TODO-JYW: TESTING-TESTING:
warnx("_v_control_mode.flag_control_attitude_enabled: %d", _v_control_mode.flag_control_attitude_enabled);
if (_v_control_mode.flag_control_attitude_enabled) {
if (_ts_opt_recovery == nullptr) {
@@ -959,9 +953,6 @@ MulticopterAttitudeControl::task_main()
}
}
// TODO-JYW: TESTING-TESTING:
warnx("_v_control_mode.flag_control_rates_enabled: %d", _v_control_mode.flag_control_rates_enabled);
if (_v_control_mode.flag_control_rates_enabled) {
control_attitude_rates(dt);
@@ -978,15 +969,9 @@ MulticopterAttitudeControl::task_main()
_controller_status.yaw_rate_integ = _rates_int(2);
_controller_status.timestamp = hrt_absolute_time();
// TODO-JYW: TESTING-TESTING:
warnx("_actuators_0_circuit_breaker_enabled: %d", _actuators_0_circuit_breaker_enabled);
if (!_actuators_0_circuit_breaker_enabled) {
if (_actuators_0_pub != nullptr) {
// TODO-JYW: TESTING-TESTING:
warnx("publishing actuator controls");
orb_publish(_actuators_id, _actuators_0_pub, &_actuators);
perf_end(_controller_latency_perf);