mirror of
https://github.com/okalachev/flix.git
synced 2026-08-16 00:38:56 +00:00
Support feed forward rates in mavlink control
This commit is contained in:
+13
-7
@@ -223,18 +223,24 @@ void handleMavlink(const void *_msg) {
|
|||||||
mavlink_msg_set_attitude_target_decode(&msg, &m);
|
mavlink_msg_set_attitude_target_decode(&msg, &m);
|
||||||
if (m.target_system && m.target_system != mavlinkSysId) return;
|
if (m.target_system && m.target_system != mavlinkSysId) return;
|
||||||
|
|
||||||
// copy attitude, rates and thrust targets
|
if (!(m.type_mask & ATTITUDE_TARGET_TYPEMASK_ATTITUDE_IGNORE)) {
|
||||||
ratesTarget.x = m.body_roll_rate;
|
// Attitude control
|
||||||
ratesTarget.y = -m.body_pitch_rate; // convert to flu
|
|
||||||
ratesTarget.z = -m.body_yaw_rate;
|
|
||||||
attitudeTarget.w = m.q[0];
|
attitudeTarget.w = m.q[0];
|
||||||
attitudeTarget.x = m.q[1];
|
attitudeTarget.x = m.q[1];
|
||||||
attitudeTarget.y = -m.q[2];
|
attitudeTarget.y = -m.q[2];
|
||||||
attitudeTarget.z = -m.q[3];
|
attitudeTarget.z = -m.q[3];
|
||||||
thrustTarget = m.thrust;
|
ratesExtra.x = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_ROLL_RATE_IGNORE ? 0 : m.body_roll_rate;
|
||||||
ratesExtra = Vector(0, 0, 0);
|
ratesExtra.y = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_PITCH_RATE_IGNORE ? 0 : -m.body_pitch_rate; // convert to flu
|
||||||
|
ratesExtra.z = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_YAW_RATE_IGNORE ? 0 : -m.body_yaw_rate;
|
||||||
|
} else {
|
||||||
|
// Rates control
|
||||||
|
attitudeTarget.invalidate();
|
||||||
|
ratesTarget.x = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_ROLL_RATE_IGNORE ? ratesTarget.x : m.body_roll_rate;
|
||||||
|
ratesTarget.y = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_PITCH_RATE_IGNORE ? ratesTarget.y : -m.body_pitch_rate;
|
||||||
|
ratesTarget.z = m.type_mask & ATTITUDE_TARGET_TYPEMASK_BODY_YAW_RATE_IGNORE ? ratesTarget.z : -m.body_yaw_rate;
|
||||||
|
}
|
||||||
|
|
||||||
if (m.type_mask & ATTITUDE_TARGET_TYPEMASK_ATTITUDE_IGNORE) attitudeTarget.invalidate();
|
thrustTarget = valid(m.thrust) ? m.thrust : thrustTarget;
|
||||||
armed = m.thrust > 0;
|
armed = m.thrust > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user