Commit 7bc1dd86 authored by Lorenz Meier's avatar Lorenz Meier

Merge branch 'mavlink_update' into joystickinput_settargets

parents d14837c3 c3edbaa1
...@@ -2865,7 +2865,7 @@ void UAS::setManual6DOFControlCommands(double x, double y, double z, double roll ...@@ -2865,7 +2865,7 @@ void UAS::setManual6DOFControlCommands(double x, double y, double z, double roll
&message, QGC::groundTimeMilliseconds(), this->uasId, 0, &message, QGC::groundTimeMilliseconds(), this->uasId, 0,
mask, q, 0, 0, 0, 0); mask, q, 0, 0, 0, 0);
sendMessage(message); sendMessage(message);
quint8 position_mask = (1 << 3) | (1 << 4) | (1 << 5) | quint16 position_mask = (1 << 3) | (1 << 4) | (1 << 5) |
(1 << 6) | (1 << 7) | (1 << 8); (1 << 6) | (1 << 7) | (1 << 8);
mavlink_msg_set_position_target_local_ned_pack(mavlink->getSystemId(), mavlink->getComponentId(), mavlink_msg_set_position_target_local_ned_pack(mavlink->getSystemId(), mavlink->getComponentId(),
&message, QGC::groundTimeMilliseconds(), this->uasId, 0, &message, QGC::groundTimeMilliseconds(), this->uasId, 0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment