数据拟合
This commit is contained in:
@@ -73,14 +73,7 @@ void terminal::process()//线程函数
|
||||
case RecieveMode : ReadStateMachine();break;
|
||||
case TransmitMode : WriteStateMachine();break;
|
||||
}
|
||||
//qDebug() << count;
|
||||
}
|
||||
//退出线程
|
||||
//disconnect(thread, nullptr, nullptr, nullptr);
|
||||
//thread->quit();
|
||||
//thread->wait();//等待结束
|
||||
//thread->deleteLater();
|
||||
//thread = nullptr;
|
||||
}
|
||||
|
||||
void terminal::setID(int m_sysid,int m_compid)
|
||||
@@ -107,7 +100,6 @@ void terminal::Transmit(QString msg)
|
||||
SerialData.append(msg);
|
||||
status.transmit.type = 0;
|
||||
status.m_Mode = TransmitMode;//发送模式
|
||||
qDebug() << "terminal" << sysid << compid << SerialData;
|
||||
start();//开启线程
|
||||
}
|
||||
}
|
||||
@@ -126,24 +118,12 @@ void terminal::Parse(mavlink_message_t msg)
|
||||
|
||||
mavlink_msg_serial_control_decode(&msg,&serial_control);
|
||||
|
||||
QByteArray str;//((char *)serial_control.data);
|
||||
|
||||
//str = (char *)serial_control.data;
|
||||
QByteArray str;
|
||||
|
||||
str.append((char *)serial_control.data,serial_control.count);
|
||||
|
||||
|
||||
|
||||
//str.setRawData((char *)serial_control.data,serial_control.count);
|
||||
|
||||
//memcpy(str,serial_control.data,SerialData.size());
|
||||
|
||||
//qDebug() << str;
|
||||
|
||||
emit Recieve(str);
|
||||
|
||||
//delete str;
|
||||
|
||||
break;
|
||||
|
||||
}
|
||||
@@ -178,7 +158,6 @@ void terminal::serial_control(void)
|
||||
|
||||
serial_control.baudrate = 115200;
|
||||
serial_control.count = SerialData.size();
|
||||
//serial_control.data = SerialData.toLatin1();
|
||||
|
||||
memcpy(serial_control.data,SerialData.toLocal8Bit().data(),SerialData.size());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user