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

发动机界面数据修改

Browse Source
This commit is contained in:
hm
2020-12-13 11:00:31 +08:00
parent 6e074e1988
commit 5f294c6996
5 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/ToolsUI/PowerSystem/PowerSystem.cpp
+11 -7
View File
@@ -230,13 +230,17 @@ void PowerSystem::setTurbineState(mavlink_turbinestate_t *t)
}
setValue(ui->label_RS,runState);
float cr = 0;
if(t->P1t != 0)
{
//setValue(ui->label_CR,QString::number((t->P3t*10.0)/t->P1t,'f',3));
cr = ((float)t->P5t * 1.0f)/t->P1t;
setValue(ui->label_CR,QString::number(cr,'f',3));
}
else
{
//setValue(ui->label_CR,QString::number(0));
cr = 0;
setValue(ui->label_CR,QString::number(0));
}
if(t->SysState & 0x0010)
@@ -271,7 +275,7 @@ void PowerSystem::setTurbineState(mavlink_turbinestate_t *t)
setValue(ui->label_KDj,QString::number(t->KDj*30.0,'f',1));
setValue(ui->label_T1t,QString::number(t->T1t + 200 - 273.15,'f',1));
setValue(ui->label_P1t,QString::number(t->P1t,'f',1));
//setValue(ui->label_CR,QString::number(((float)t->P5t)/t->P1t,'f',1));
setValue(ui->label_DJS,QString::number(t->DJS / 4.0,'f',1));
setValue(ui->label_Vcc,QString::number(t->Vcc / 5.0,'f',1));
@@ -323,13 +327,13 @@ void PowerSystem::setTurbineState(mavlink_turbinestate_t *t)
ScopeRPM->setSerieData(tr("物理转速"),t->RPM_mea);
ScopeRPM->setSerieData(tr("期望物理转速"),t->RPM_des);
ScopeRPM->setSerieData(tr("物理"),t->RPM_mea);
ScopeRPM->setSerieData(tr("期望"),t->RPM_des);
ScopeTemp->setSerieData(tr("排气温度T5"),t->T5 * 0.1 - 273.15);
ScopeTemp->setSerieData(tr("压比"),cr);
//从新做一个函数
ScopeAlt->setSerieData(tr("海拔"),t->asl_ap*100.0);
ScopeAlt->setSerieData(tr("Wf测"),t->P3t);
//ScopeMa->setSerieData(tr("马赫"),t->tas_ap);
App/ToolsUI/PowerSystem/PowerSystem.ui
+4 -4
View File
@@ -55,7 +55,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
<string notr="true">background-color: rgb(170, 255, 127);</string>
</property>
<property name="text">
<string/>
@@ -173,7 +173,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
<string notr="true">background-color: rgb(170, 255, 127);</string>
</property>
<property name="text">
<string/>
@@ -218,7 +218,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
<string notr="true">background-color: rgb(170, 255, 127);</string>
</property>
<property name="text">
<string/>
@@ -256,7 +256,7 @@
</size>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
<string notr="true">background-color: rgb(170, 255, 127);</string>
</property>
<property name="text">
<string/>
App/mainwindow.cpp
+1 -1
View File
@@ -1721,7 +1721,7 @@ void MainWindow::updateUI()//事件驱动式更新数据
toolsui->diagram->setBattery(8,QString::number((int16_t)dlink->mavlinknode->vehicle.bmustate.BAT2_low_temp_degC,'f',1));
toolsui->diagram->setDlink(1,QString::number(dlink->mavlinknode->rssi,'f',0));
toolsui->diagram->setDlink(2,QString::number(dlink->mavlinknode->bitrate));
toolsui->diagram->setDlink(2,QString::number(dlink->mavlinknode->rate_in));
//dlink->mavlinknode->vehicle.turbinstate.RPM_mea = 12000;