合并后无法运行原因找到,QtMavlinkNode写成QtMavLinkNode导致错误
This commit is contained in:
@@ -38,7 +38,7 @@ DESTDIR = $$PWD/../thirdpart/lib
|
||||
MOC_DIR = $$PWD/../build
|
||||
OBJECTS_DIR = $$PWD/../build
|
||||
|
||||
DEFINES += QtMavLinkNode
|
||||
DEFINES += QtMavlinkNode
|
||||
|
||||
|
||||
HEADERS += \
|
||||
|
||||
@@ -8,7 +8,7 @@ MavLinkNode::MavLinkNode(QObject *parent) : QObject(parent)
|
||||
this->moveToThread(Nodethread);
|
||||
connect(Nodethread, &QThread::started, this, &MavLinkNode::process);
|
||||
|
||||
setRunFrq(200);//200Hz
|
||||
setRunFrq(50);//50
|
||||
|
||||
//初始化buff
|
||||
initbuff();
|
||||
@@ -21,6 +21,7 @@ MavLinkNode::~MavLinkNode()
|
||||
Nodethread->quit();
|
||||
Nodethread->wait();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void MavLinkNode::setRunFrq(uint32_t frq)
|
||||
@@ -79,15 +80,11 @@ void MavLinkNode::process()//线程函数
|
||||
//解码从UDP来的
|
||||
datagram.clear();
|
||||
datagram = readbuff(SourceType::c_sock);//每次全部读取
|
||||
|
||||
//qDebug() << datagram;
|
||||
|
||||
|
||||
if(!datagram.isEmpty())
|
||||
{
|
||||
Mavlinkparse(SourceType::c_sock,datagram);
|
||||
}
|
||||
/*
|
||||
|
||||
//解码从串口来的
|
||||
datagram.clear();
|
||||
datagram = readbuff(SourceType::s_port);//每次全部读取
|
||||
@@ -95,7 +92,7 @@ void MavLinkNode::process()//线程函数
|
||||
{
|
||||
Mavlinkparse(SourceType::s_port,datagram);
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
//退出线程
|
||||
Nodethread->quit();
|
||||
|
||||
Reference in New Issue
Block a user