diff --git a/App/CommandBox/CommandBox.cpp b/App/CommandBox/CommandBox.cpp index 7373b78..65b14f9 100644 --- a/App/CommandBox/CommandBox.cpp +++ b/App/CommandBox/CommandBox.cpp @@ -330,7 +330,7 @@ void CommandBox::on_pushButton_SendCommand_clicked() } else if(cmdType == 1) { - emit showMessage(tr("发送参数 ") + " " + ui->comboBox_IMU->itemText(m_value),5000); + emit showMessage(tr("修改参数 ") + " " + ui->comboBox_IMU->itemText(m_value),5000); emit WriteCmd(m_sysid,m_compid,m_id.toLatin1().data(),m_type,m_value); qDebug() << m_type << m_value; } @@ -383,7 +383,7 @@ void CommandBox::on_paramClicked(uint8_t sysid, uint8_t compid , QString id, uin m_type = type; m_value = value; - ui->lineEdit_CommandName->setText(id); + ui->lineEdit_CommandName->setText(id + " " + QString::number(value)); cmdType = 1; } diff --git a/App/ToolsUI/tools_Index3/tools_Index3.cpp b/App/ToolsUI/tools_Index3/tools_Index3.cpp index db89266..a793576 100644 --- a/App/ToolsUI/tools_Index3/tools_Index3.cpp +++ b/App/ToolsUI/tools_Index3/tools_Index3.cpp @@ -11,7 +11,7 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS QString msgstr; switch (type) { case QtDebugMsg: - msgstr = QString::asprintf(">> Debug: %s \r\n", qPrintable(msg)); + msgstr = QString::asprintf(">> Debug: %s \r\n", qPrintable(msg)); break; case QtInfoMsg: msgstr = QString::asprintf(">> Info: %s \r\n", qPrintable(msg)); diff --git a/App/mainwindow.cpp b/App/mainwindow.cpp index 8076052..2d86e46 100644 --- a/App/mainwindow.cpp +++ b/App/mainwindow.cpp @@ -1171,7 +1171,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 statusui->setState(2,QString::number(dlink->mavlinknode->vehicle.attitude.pitch * 57.3,'f',1), QString::number(dlink->mavlinknode->vehicle.nav_controller_output.nav_pitch,'f',1)); - statusui->setState(3,QString::number(to360deg(dlink->mavlinknode->vehicle.global_position_int.hdg),'f',1), + statusui->setState(3,QString::number(to360deg(dlink->mavlinknode->vehicle.gps_raw_int.cog * 0.01),'f',1), QString::number(to360deg(dlink->mavlinknode->vehicle.nav_controller_output.nav_bearing),'f',1)); statusui->setState(4,QString::number(to360deg(dlink->mavlinknode->vehicle.attitude.yaw * 57.3),'f',1),tr(" ")); @@ -1222,9 +1222,9 @@ void MainWindow::updateUI()//事件驱动式更新数据 statusui->setAttitude1(1,QString::number(dlink->mavlinknode->vehicle.ins1.ax,'f',1)); statusui->setAttitude1(2,QString::number(dlink->mavlinknode->vehicle.ins1.ay,'f',1)); statusui->setAttitude1(3,QString::number(dlink->mavlinknode->vehicle.ins1.az,'f',1)); - statusui->setAttitude1(4,QString::number(dlink->mavlinknode->vehicle.ins1.gx * 57.3,'f',1)); - statusui->setAttitude1(5,QString::number(dlink->mavlinknode->vehicle.ins1.gy * 57.3,'f',1)); - statusui->setAttitude1(6,QString::number(dlink->mavlinknode->vehicle.ins1.gz * 57.3,'f',1)); + statusui->setAttitude1(4,QString::number(dlink->mavlinknode->vehicle.ins1.gx,'f',1)); + statusui->setAttitude1(5,QString::number(dlink->mavlinknode->vehicle.ins1.gy,'f',1)); + statusui->setAttitude1(6,QString::number(dlink->mavlinknode->vehicle.ins1.gz,'f',1)); statusui->setAttitude1(7,QString::number(dlink->mavlinknode->vehicle.ins1.roll * 57.3,'f',1)); statusui->setAttitude1(8,QString::number(dlink->mavlinknode->vehicle.ins1.pitch * 57.3,'f',1)); statusui->setAttitude1(9,QString::number(to360deg(dlink->mavlinknode->vehicle.ins1.yaw * 57.3),'f',1)); @@ -1232,9 +1232,9 @@ void MainWindow::updateUI()//事件驱动式更新数据 statusui->setAttitude2(1,QString::number(dlink->mavlinknode->vehicle.ins2.ax,'f',1)); statusui->setAttitude2(2,QString::number(dlink->mavlinknode->vehicle.ins2.ay,'f',1)); statusui->setAttitude2(3,QString::number(dlink->mavlinknode->vehicle.ins2.az,'f',1)); - statusui->setAttitude2(4,QString::number(dlink->mavlinknode->vehicle.ins2.gx * 57.3,'f',1)); - statusui->setAttitude2(5,QString::number(dlink->mavlinknode->vehicle.ins2.gy * 57.3,'f',1)); - statusui->setAttitude2(6,QString::number(dlink->mavlinknode->vehicle.ins2.gz * 57.3,'f',1)); + statusui->setAttitude2(4,QString::number(dlink->mavlinknode->vehicle.ins2.gx,'f',1)); + statusui->setAttitude2(5,QString::number(dlink->mavlinknode->vehicle.ins2.gy,'f',1)); + statusui->setAttitude2(6,QString::number(dlink->mavlinknode->vehicle.ins2.gz,'f',1)); statusui->setAttitude2(7,QString::number(dlink->mavlinknode->vehicle.ins2.roll * 57.3,'f',1)); statusui->setAttitude2(8,QString::number(dlink->mavlinknode->vehicle.ins2.pitch * 57.3,'f',1)); statusui->setAttitude2(9,QString::number(to360deg(dlink->mavlinknode->vehicle.ins2.yaw * 57.3),'f',1)); diff --git a/readme.md b/readme.md index 0b2ac42..eb29447 100644 --- a/readme.md +++ b/readme.md @@ -179,4 +179,12 @@ SBG,需要设置坐标轴,坐标系存在问题 √曲线自适应,最小值无法自适应 数据首次输入需要跳转到当前界面 +曲线界面线型设置没有成功 + +ins 角速度单位 rad。deg + + +曲线界面 做个checkbox 选择不同传感器 + +曲线最大最小取整