diff --git a/App/ToolsUI/Payload/Payload.cpp b/App/ToolsUI/Payload/Payload.cpp index 5fdf7fd..48b306d 100644 --- a/App/ToolsUI/Payload/Payload.cpp +++ b/App/ToolsUI/Payload/Payload.cpp @@ -950,6 +950,7 @@ void Payload::setup_commands(void) //发到encap QByteArray rwr_encap; + rwr_encap.clear(); for(int i = 0;i< 13;i++) { @@ -1127,6 +1128,7 @@ void Payload::setup_commands(void) //发送到encap QByteArray uv_encap; + uv_encap.clear(); for(int i = 0;i< 13;i++) { diff --git a/MavLinkNode/datastream.cpp b/MavLinkNode/datastream.cpp index 7b7ae86..ab8c63f 100644 --- a/MavLinkNode/datastream.cpp +++ b/MavLinkNode/datastream.cpp @@ -280,16 +280,19 @@ void DataStream::sendAFrame(void) size_t len = databuff.size(); - if(len > 253) - { - len = 253; - } - for(uint16_t i = 0;i < len;i++) { encapsulated_data.data[i] = (uint8_t)databuff[i]; } + if(len < 253) + { + for(uint16_t i = len;i < 253;i++) + { + encapsulated_data.data[i] = 0; + } + } + qDebug() << "send encap" << databuff; mavlink_msg_encapsulated_data_encode(GCS_SysID,GCS_CompID, &msg,&encapsulated_data);