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

去除与jd900不相关的健康字

Browse Source
This commit is contained in:
zhangxusong
2024-07-28 15:53:13 +08:00
parent bb1f76552c
commit 1c8ccfd847
2 changed files with 25 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/HealthUI/HealthUI.cpp
+3 -9
View File
@@ -21,7 +21,7 @@ HealthUI::HealthUI(QWidget *parent) :
Install("320B",index++,state::inital);
Install("100e",index++,state::inital);
Install("大气机",index++,state::inital);
Install("起落架",index++,state::inital);
Install("回收控制器",index++,state::inital);
Install("配电盒",index++,state::inital);//5
Install("记录仪",index++,state::inital);//
@@ -50,16 +50,10 @@ HealthUI::HealthUI(QWidget *parent) :
Install("切伞",index++,state::inital);//25
Install("蓄电池加温",index++,state::inital);
Install("刹车/收放",index++,state::inital);
Install("回收系统",index++,state::inital);
Install("滑油变送器",index++,state::inital);
Install("起落架放",index++,state::inital);
Install("舱门打开",index++,state::inital);//30 3个通道都加温才变绿
Install("副翼/方向",index++,state::inital);
Install("转向/变体锁",index++,state::inital);
Install("电源状态",index++,state::inital);//
Install("起落架承载",index++,state::inital);//
Install("刹车开启",index++,state::inital);
App/mainwindow.cpp
+22 -133
View File
@@ -1953,43 +1953,13 @@ void MainWindow::updateVehicle(MavLinkNode::_vehicle vehicle)//事件驱动式
healthui->setValue(16,getBit(health,3)?("使用100e"):("使用320"));//使用320/使用SBG
healthui->setColor(16,getBit(health,3)?(HealthUI::state::warning):(HealthUI::state::success));
//healthui->setColor(17,getBit(present,25)?(HealthUI::state::success):(HealthUI::state::inital));//空速管加温
//healthui->setColor(18,getBit(present,25)?(HealthUI::state::success):(HealthUI::state::inital));//插销上锁
//healthui->setColor(19,getBit(present,28)?(HealthUI::state::success):(HealthUI::state::inital));//变体上锁
//healthui->setColor(20,getBit(present,29)?(getBit(present,30)?(HealthUI::state::success):(HealthUI::state::failure)):(HealthUI::state::success));//56V并网
//healthui->setColor(21,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//燃油泵
//healthui->setColor(22,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//燃油切断阀
//healthui->setColor(23,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//温度变送器
healthui->setColor(24,getBit(health,2)?(HealthUI::state::failure):(HealthUI::state::success));//开伞
healthui->setColor(25,getBit(health,1)?(HealthUI::state::failure):(HealthUI::state::success));//切伞
//healthui->setColor(26,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//蓄电池加温
//healthui->setColor(27,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//刹车/收放
//healthui->setColor(28,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//滑油变送器
//healthui->setColor(29,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//起落架放
//healthui->setColor(30,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//舱门打开
//healthui->setColor(31,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//副翼/方向
//healthui->setColor(32,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//扰流/升降
//healthui->setColor(33,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//转向/变体
//healthui->setColor(34,getBit(present,31)?(HealthUI::state::success):(HealthUI::state::inital));//起落架承载
healthui->setValue(35,getBit(health,0)?(tr("刹车")):(tr("不刹车")));//刹车开启
healthui->setColor(35,getBit(health,0)?(HealthUI::state::failure):(HealthUI::state::success));//刹车开启
/*
qDebug() << "main" << QString::number(enabled,16).toUpper() << indexCount;
QString bits;
for(int i = 31;i>=0;i--)
{
bits.append(getBit(enabled,i)?("1"):("0"));
}
qDebug() << bits;
*/
//===================status ui =============================================
@@ -2483,90 +2453,12 @@ void MainWindow::gear_Info(Parse::_gear info)
//healthui->setColor(25,(info.DO[0]&0x80)?(HealthUI::state::success):(HealthUI::state::inital));//切伞
if(!info.SW[2] && !info.SW[7] && !info.SW[12])
{
healthui->setValue(29,tr("起落架收起"));//起落架收放
healthui->setColor(29,HealthUI::state::success);
}
else if(!info.SW[1] && !info.SW[6] && !info.SW[11])
{
healthui->setValue(29,tr("起落架放下"));//起落架收放
healthui->setColor(29,HealthUI::state::failure);
}
else
{
healthui->setValue(29,tr("起落架运动"));//起落架收放
healthui->setColor(29,HealthUI::state::warning);
}
if(!info.SW[4] && !info.SW[19] && !info.SW[9]&& !info.SW[14])
{
healthui->setValue(30,tr("舱门关闭"));//舱门开关
healthui->setColor(30,HealthUI::state::success);//舱门开关
}
else if(info.SW[4] && info.SW[19] && info.SW[9]&& info.SW[14])
{
healthui->setValue(30,tr("舱门打开"));//舱门开关
healthui->setColor(30,HealthUI::state::failure);//舱门打开
}
else
{
healthui->setValue(30,tr("舱门运动"));//舱门开关
healthui->setColor(30,HealthUI::state::warning);//舱门开关
}
bool left = getBit(health,4);
bool right = getBit(health,5);
bool nose = getBit(health,6);
if(info.SW[0] && info.SW[5] && info.SW[10] && left && right &&nose)
{
healthui->setValue(34,tr("起落架承载"));
healthui->setColor(34,HealthUI::state::failure);//起落架承载
}
else
{
if(info.SW[5] && info.SW[10] && !nose)
{
healthui->setValue(34,tr("前 未承载"));
healthui->setColor(34,HealthUI::state::warning);//起落架承载
}
else if(info.SW[0] && info.SW[10] && !left)
{
healthui->setValue(34,tr("左 未承载"));
healthui->setColor(34,HealthUI::state::warning);//起落架承载
}
else if(info.SW[0] && info.SW[5] && !right)
{
healthui->setValue(34,tr("右 未承载"));
healthui->setColor(34,HealthUI::state::warning);//起落架承载
}
else
{
if(info.SW[10])
{
healthui->setValue(34,tr("前左未承载"));
healthui->setColor(34,HealthUI::state::warning);//起落架承载
}
else if(info.SW[5])
{
healthui->setValue(34,tr("前右未承载"));
healthui->setColor(34,HealthUI::state::warning);//起落架承载
}
else if(info.SW[0])
{
healthui->setValue(34,tr("左右未承载"));
healthui->setColor(34,HealthUI::state::warning);//起落架承载
}
else{
healthui->setValue(34,tr("起落架未承载"));
healthui->setColor(34,HealthUI::state::success);//起落架承载
}
}
}
/*
@@ -2575,7 +2467,6 @@ void MainWindow::gear_Info(Parse::_gear info)
*/
//healthui->setColor(35,(heatstate)?(HealthUI::state::success):(HealthUI::state::inital));//刹车开启
statusui->setValue("燃油流量[kg/m]",QString::number(info.fuel,'f',1));
@@ -2707,19 +2598,19 @@ void MainWindow::actuator_info(Parse::_actuator info)
void MainWindow::actuator_info_brake(Parse::_actuator info)
{
if(healthui)
{
if(info.left_brake == 0x11)
{
healthui->setValue(18,tr("变体抱死"));
healthui->setColor(18,HealthUI::state::success);//变体抱死
}
else
{
healthui->setValue(18,tr("变体解锁"));
healthui->setColor(18,HealthUI::state::failure);//变体解锁
}
}
// if(healthui)
// {
// if(info.left_brake == 0x11)
// {
// healthui->setValue(18,tr("变体抱死"));
// healthui->setColor(18,HealthUI::state::success);//变体抱死
// }
// else
// {
// healthui->setValue(18,tr("变体解锁"));
// healthui->setColor(18,HealthUI::state::failure);//变体解锁
// }
// }
}
void MainWindow::actuator1_info(Parse::_actuator1 info)
@@ -2896,29 +2787,27 @@ void MainWindow::SSPC_Info_state(Parse::_sspc info)
healthui->setColor(27,(info.state2.current_ch13)?(HealthUI::state::success):(HealthUI::state::inital));//刹车/气路
healthui->setColor(27,(info.state2.current_ch13)?(HealthUI::state::success):(HealthUI::state::inital));//回收系统
healthui->setColor(28,(info.state2.current_ch14)?(HealthUI::state::success):(HealthUI::state::inital));//滑油
healthui->setColor(31,(info.state1.current_ch2)?(HealthUI::state::success):(HealthUI::state::inital));//副翼
healthui->setColor(32,(info.state2.current_ch11)?(HealthUI::state::success):(HealthUI::state::inital));//转向
//电源源
switch (info.source&0x03) {
case 0x00:
healthui->setColor(33,HealthUI::state::inital);
healthui->setValue(33,tr("无"));
healthui->setColor(29,HealthUI::state::inital);
healthui->setValue(29,tr("无"));
break;
case 0x01:
healthui->setValue(33,tr("地面电源"));
healthui->setColor(33,HealthUI::state::failure);
healthui->setValue(29,tr("地面电源"));
healthui->setColor(29,HealthUI::state::failure);
break;
case 0x02:
healthui->setValue(33,tr("主电源"));
healthui->setColor(33,HealthUI::state::success);
healthui->setValue(29,tr("主电源"));
healthui->setColor(29,HealthUI::state::success);
break;
case 0x03:
healthui->setValue(33,tr("蓄电池"));
healthui->setColor(33,HealthUI::state::warning);
healthui->setValue(29,tr("蓄电池"));
healthui->setColor(29,HealthUI::state::warning);
break;
}
}