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

将状态栏500b相关数据去除

Browse Source
This commit is contained in:
zhangxusong
2024-01-19 10:32:37 +08:00
parent f71e3dc3ca
commit 4baa0f6929
3 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/StatusUI/StatusUI.cpp
+24 -23
View File
@@ -58,16 +58,16 @@ StatusUI::StatusUI(QWidget *parent) :
t->setRange(-30, 30);
t = install(actuator,0,"右方向[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
t->setRange(-30, 30);
t = install(actuator,0,"左扰流[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
t->setRange(0, 60);
t = install(actuator,0,"右扰流[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
t->setRange(0, 60);
t = install(actuator,0,"左变体[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
t->setRange(0, 65);
t = install(actuator,0,"右变体[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
t->setRange(0, 65);
t = install(actuator,0,"转向[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
t->setRange(-17, 17);
// t = install(actuator,0,"左扰流[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
// t->setRange(0, 60);
// t = install(actuator,0,"右扰流[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
// t->setRange(0, 60);
// t = install(actuator,0,"左变体[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
// t->setRange(0, 65);
// t = install(actuator,0,"右变体[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
// t->setRange(0, 65);
// t = install(actuator,0,"转向[°]",0,QMap<QVariant, StateWidget::state>{{2,StateWidget::state::red}}, true);
// t->setRange(-17, 17);
//左副翼，右副翼，左升降，右升降，左方向，右方向，左扰流，右扰流，左变体，右变体
install(state,0,"油门[%]",0,
@@ -170,20 +170,21 @@ StatusUI::StatusUI(QWidget *parent) :
{5,StateWidget::state::orange},
{10,StateWidget::state::red}});
install(battery,0,"左刹车油压[MPa]",0,
QMap<QVariant, StateWidget::state>{{0,StateWidget::state::green},
{0.8,StateWidget::state::green},
{1,StateWidget::state::orange}});
// install(battery,0,"左刹车油压[MPa]",0,
// QMap<QVariant, StateWidget::state>{{0,StateWidget::state::green},
// {0.8,StateWidget::state::green},
// {1,StateWidget::state::orange}});
// install(battery,0,"右刹车油压[MPa]",0,
// QMap<QVariant, StateWidget::state>{{0,StateWidget::state::green},
// {0.8,StateWidget::state::green},
// {1,StateWidget::state::orange}});
// install(battery,0,"起落架气压[MPa]",0,
// QMap<QVariant, StateWidget::state>{{0,StateWidget::state::red},
// {2,StateWidget::state::red},
// {5,StateWidget::state::orange},
// {15,StateWidget::state::green}});
install(battery,0,"右刹车油压[MPa]",0,
QMap<QVariant, StateWidget::state>{{0,StateWidget::state::green},
{0.8,StateWidget::state::green},
{1,StateWidget::state::orange}});
install(battery,0,"起落架气压[MPa]",0,
QMap<QVariant, StateWidget::state>{{0,StateWidget::state::red},
{2,StateWidget::state::red},
{5,StateWidget::state::orange},
{15,StateWidget::state::green}});
// install(battery, 0, "左变体电流[A]", 0, QMap<QVariant, StateWidget::state>{{0,StateWidget::state::green},
// {5,StateWidget::state::orange},
// {10,StateWidget::state::red}});
App/ToolsUI/INS/INS.ui
+3
View File
@@ -2432,6 +2432,9 @@
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="7" column="1">
App/mainwindow.cpp
+20 -20
View File
@@ -1469,17 +1469,17 @@ void MainWindow::update_servo_output_raw(int sysid,mavlink_servo_output_raw_t se
{
//12-16
statusui->setValue(0,1,10,QString::number(act_pwm2deg3(servo.servo1_raw,ste_fix),'f',2) + '|'
+ QString::number(act_pwm2deg3(servo.servo9_raw,ste_fix),'f',2));
// statusui->setValue(0,1,10,QString::number(act_pwm2deg3(servo.servo1_raw,ste_fix),'f',2) + '|'
// + QString::number(act_pwm2deg3(servo.servo9_raw,ste_fix),'f',2));
statusui->setValue(0,1,8,QString::number(act_pwm2deg3(servo.servo2_raw,vtl_fix),'f',2) + '|'
+ QString::number(act_pwm2deg3(servo.servo10_raw,vtl_fix),'f',2));
// statusui->setValue(0,1,8,QString::number(act_pwm2deg3(servo.servo2_raw,vtl_fix),'f',2) + '|'
// + QString::number(act_pwm2deg3(servo.servo10_raw,vtl_fix),'f',2));
statusui->setValue(0,1,9,QString::number(act_pwm2deg3(servo.servo3_raw,vtr_fix),'f',2) + '|'
+ QString::number(act_pwm2deg3(servo.servo11_raw,vtr_fix),'f',2));
// statusui->setValue(0,1,9,QString::number(act_pwm2deg3(servo.servo3_raw,vtr_fix),'f',2) + '|'
// + QString::number(act_pwm2deg3(servo.servo11_raw,vtr_fix),'f',2));
statusui->setValue(0,1,0,QString::number(act_pwm2deg3(servo.servo4_raw,dal_fix),'f',2) + '|'
+ QString::number(act_pwm2deg3(servo.servo12_raw,dal_fix),'f',2));
// statusui->setValue(0,1,0,QString::number(act_pwm2deg3(servo.servo4_raw,dal_fix),'f',2) + '|'
// + QString::number(act_pwm2deg3(servo.servo12_raw,dal_fix),'f',2));
statusui->setValue(0,1,1,QString::number(act_pwm2deg3(servo.servo5_raw,dar_fix),'f',2) + '|'
+ QString::number(act_pwm2deg3(servo.servo13_raw,dar_fix),'f',2));
@@ -1502,11 +1502,11 @@ void MainWindow::update_servo_output_raw(int sysid,mavlink_servo_output_raw_t se
statusui->setValue(0,1,3,QString::number(-act_pwm2deg3(servo.servo1_raw,der_fix),'f',2) + '|'
+ QString::number(-act_pwm2deg3(servo.servo4_raw,der_fix),'f',2));
statusui->setValue(0,1,6,QString::number(act_pwm2deg3(servo.servo2_raw,dspl_fix),'f',2) + '|'
+ QString::number(act_pwm2deg3(servo.servo5_raw,dspl_fix),'f',2));
// statusui->setValue(0,1,6,QString::number(act_pwm2deg3(servo.servo2_raw,dspl_fix),'f',2) + '|'
// + QString::number(act_pwm2deg3(servo.servo5_raw,dspl_fix),'f',2));
statusui->setValue(0,1,7,QString::number(act_pwm2deg3(servo.servo3_raw,dspr_fix),'f',2) + '|'
+ QString::number(act_pwm2deg3(servo.servo6_raw,dspr_fix),'f',2));
// statusui->setValue(0,1,7,QString::number(act_pwm2deg3(servo.servo3_raw,dspr_fix),'f',2) + '|'
// + QString::number(act_pwm2deg3(servo.servo6_raw,dspr_fix),'f',2));
@@ -2594,14 +2594,14 @@ void MainWindow::gear_Info(Parse::_gear info)
}
if(statusui)
{
statusui->setValue(1,0,9,QString::number(info.LeftPressure,'f',3));//左刹车压力
statusui->setValue(1,0,10,QString::number(info.RightPressure,'f',3));//右刹车压力
statusui->setValue(1,0,11,QString::number(info.AirPressure,'f',3));//起落架压力
statusui->setValue(1,0,12,QString::number(info.LeftWheel,'f',0));//左轮速
statusui->setValue(1,0,13,QString::number(info.RightWheel,'f',0));//右轮速
}
// if(statusui)
// {
// statusui->setValue(1,0,9,QString::number(info.LeftPressure,'f',3));//左刹车压力
// statusui->setValue(1,0,10,QString::number(info.RightPressure,'f',3));//右刹车压力
// statusui->setValue(1,0,11,QString::number(info.AirPressure,'f',3));//起落架压力
// statusui->setValue(1,0,12,QString::number(info.LeftWheel,'f',0));//左轮速
// statusui->setValue(1,0,13,QString::number(info.RightWheel,'f',0));//右轮速
// }
}