hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b

Browse Source
This commit is contained in:
Company
2020-04-09 20:19:56 +08:00
parent 2594deaa06
commit 30b19634ff
15 changed files with 135 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MavLinkNode/mavlinknode.cpp
+5 -5
View File
@@ -119,7 +119,7 @@ void MavLinkNode::stop()
void MavLinkNode::process()//线程函数
{
uint8_t count = 0;
QByteArray datagram = NULL;
QByteArray datagram = nullptr;
while (running_flag)
{
count ++;
@@ -197,7 +197,7 @@ QByteArray MavLinkNode::readbuff(quint32 src)
case SourceType::c_sock:
if(client_buff.select == 0)
{
datagram.setRawData(client_buff.buff[1],client_buff.buff[1].size());
datagram.setRawData(client_buff.buff[1],(uint)client_buff.buff[1].size());
//清除这个未选择的buff
client_buff.buff[1].clear();
//读取完成，可以往这个内存里面写数了
@@ -205,7 +205,7 @@ QByteArray MavLinkNode::readbuff(quint32 src)
}
else if(client_buff.select == 1)
{
datagram.setRawData(client_buff.buff[0],client_buff.buff[0].size());
datagram.setRawData(client_buff.buff[0],(uint)client_buff.buff[0].size());
//清除这个未选择的buff
client_buff.buff[0].clear();
@@ -216,14 +216,14 @@ QByteArray MavLinkNode::readbuff(quint32 src)
case SourceType::s_port:
if(serial_buff.select == 0)
{
datagram.setRawData(serial_buff.buff[1],serial_buff.buff[1].size());
datagram.setRawData(serial_buff.buff[1],(uint)serial_buff.buff[1].size());
//读取完成，可以往这个内存里面写数了
serial_buff.buff[1].clear();
serial_buff.select = 1;
}
else if(serial_buff.select == 1)
{
datagram.setRawData(serial_buff.buff[0],serial_buff.buff[0].size());
datagram.setRawData(serial_buff.buff[0],(uint)serial_buff.buff[0].size());
//读取完成，可以往这个内存里面写数了
serial_buff.buff[0].clear();
serial_buff.select = 0;