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-10-08 14:09:16 +08:00
parent a2181cbeb9
commit 88019cd149
4 changed files with 411 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/ToolsUI/PowerSystem/PowerSystem.cpp
+24 -24
View File
@@ -236,30 +236,30 @@ void PowerSystem::setTurbineState(mavlink_turbinestate_t *t)
setValue(ui->label_RPM_mea,QString::number(t->RPM_mea));
setValue(ui->label_T5,QString::number(t->T5));
setValue(ui->label_RPM_mea,QString::number(t->Kfuel));
setValue(ui->label_RPM_mea,QString::number(t->RPM_des));
setValue(ui->label_RPM_mea,QString::number(t->RPM_des_ap));
setValue(ui->label_RPM_mea,QString::number(t->stage_ap));
setValue(ui->label_RPM_mea,QString::number(t->temp_ap));
setValue(ui->label_RPM_mea,QString::number(t->tas_ap));
setValue(ui->label_RPM_mea,QString::number(t->asl_ap));
setValue(ui->label_RPM_mea,QString::number(t->KabMain));
setValue(ui->label_RPM_mea,QString::number(t->KabFire));
setValue(ui->label_T5,QString::number(t->KDj));
setValue(ui->label_RPM_mea,QString::number(t->T1t));
setValue(ui->label_RPM_mea,QString::number(t->P1t));
setValue(ui->label_RPM_mea,QString::number(t->P3t));
setValue(ui->label_RPM_mea,QString::number(t->P5t));
setValue(ui->label_RPM_mea,QString::number(t->DJS));
setValue(ui->label_RPM_mea,QString::number(t->Vcc));
setValue(ui->label_RPM_mea,QString::number(t->Tbak));
setValue(ui->label_RPM_mea,QString::number(t->RPM_bak));
setValue(ui->label_RPM_mea,QString::number(t->IOState));
setValue(ui->label_RPM_mea,QString::number(t->SysState));
setValue(ui->label_RPM_mea,QString::number(t->Fault));
setValue(ui->label_RPM_mea,QString::number(t->rev));
setValue(ui->label_RPM_mea,QString::number(t->CFuelMode));
setValue(ui->label_RPM_mea,QString::number(t->Cmd));
setValue(ui->label_Kfuel,QString::number(t->Kfuel));
setValue(ui->label_RPM_des,QString::number(t->RPM_des));
setValue(ui->label_RPM_des_ap,QString::number(t->RPM_des_ap));
setValue(ui->label_stage_ap,QString::number(t->stage_ap));
setValue(ui->label_temp_ap,QString::number(t->temp_ap));
setValue(ui->label_tas_ap,QString::number(t->tas_ap));
setValue(ui->label_asl_ap,QString::number(t->asl_ap));
setValue(ui->label_KabMain,QString::number(t->KabMain));
setValue(ui->label_KabFire,QString::number(t->KabFire));
setValue(ui->label_KDj,QString::number(t->KDj));
setValue(ui->label_T1t,QString::number(t->T1t));
setValue(ui->label_P1t,QString::number(t->P1t));
setValue(ui->label_P3t,QString::number(t->P3t));
setValue(ui->label_P5t,QString::number(t->P5t));
setValue(ui->label_DJS,QString::number(t->DJS));
setValue(ui->label_Vcc,QString::number(t->Vcc));
//setValue(ui->label_Tbak,QString::number(t->Tbak));
setValue(ui->label_RPM_bak,QString::number(t->RPM_bak));
//setValue(ui->label_IOState,QString::number(t->IOState));
//setValue(ui->label_SysState,QString::number(t->SysState));
//setValue(ui->label_Fault,QString::number(t->Fault));
//setValue(ui->label_rev,QString::number(t->rev));
setValue(ui->label_CFuelMode,QString::number(t->CFuelMode));
setValue(ui->label_Cmd,QString::number(t->Cmd));
setColor(ui->checkBox_1,((t->SysState & 0x0100) > 0)?(state::failure):(state::success));
App/ToolsUI/ServoSystem/ServoSystem.cpp
+6
View File
@@ -92,5 +92,11 @@ void ServoSystem::setBUMState(mavlink_bmustate_t *t)
ui->label_onBoard_56V_Voltage->setText(QString::number(t->BAT2_group_voltage_mv));
ui->label_onBoard_56V_Current->setText(QString::number(t->BAT2_group_current_dA));
}
App/ToolsUI/ServoSystem/ServoSystem.ui
+380 -82
View File
@@ -6,80 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>649</width>
<height>471</height>
<width>838</width>
<height>807</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>舵机</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QPushButton" name="pushButton_Servo_Read">
<property name="text">
<string>状态查询</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pushButton_Servo_Zero">
<property name="text">
<string>舵面找零</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="pushButton_Servo_Check">
<property name="text">
<string>地面自检</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="pushButton_Servo_Work">
<property name="text">
<string>工作模式</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
@@ -214,20 +148,6 @@
<set>Qt::AlignCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="1">
<widget class="QCheckBox" name="checkBox_onBoard">
<property name="text">
<string>机载电源</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QCheckBox" name="checkBox_56v">
<property name="text">
<string>56V电源</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="checkBox_28v">
<property name="text">
@@ -242,6 +162,20 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkBox_onBoard">
<property name="text">
<string>机载电源</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QCheckBox" name="checkBox_56v">
<property name="text">
<string>56V电源</string>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QCheckBox" name="checkBox_AirSpeed">
<property name="text">
@@ -259,6 +193,370 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>舵机</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>方向舵</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>指令位</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_4">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_6">
<property name="text">
<string>上电自检</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>当前位</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_5">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_9">
<property name="text">
<string>找零</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_10">
<property name="text">
<string>地面自检</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_Servo_Check">
<property name="text">
<string>上电自检</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Servo_Read">
<property name="text">
<string>舵面找零</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Servo_Zero">
<property name="text">
<string>地面自检 </string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Servo_Work">
<property name="text">
<string>工作模式</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_6">
<property name="title">
<string>左升降</string>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<item row="1" column="0">
<widget class="QLabel" name="label_37">
<property name="text">
<string>当前位</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_40">
<property name="text">
<string>地面自检</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_36">
<property name="text">
<string>上电自检</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_35">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_34">
<property name="text">
<string>指令位</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_39">
<property name="text">
<string>找零</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_38">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_7">
<property name="title">
<string>右升降</string>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="1" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>当前位</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_17">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_18">
<property name="text">
<string>找零</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_14">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_19">
<property name="text">
<string>地面自检</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_15">
<property name="text">
<string>上电自检</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>指令位</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>左副翼</string>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>指令位</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_21">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_22">
<property name="text">
<string>上电自检</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>当前位</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_24">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_25">
<property name="text">
<string>找零</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_26">
<property name="text">
<string>地面自检</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QGroupBox" name="groupBox_8">
<property name="title">
<string>右副翼</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
<string>指令位</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_28">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_29">
<property name="text">
<string>上电自检</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_30">
<property name="text">
<string>当前位</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_31">
<property name="styleSheet">
<string notr="true">background-color: rgb(205, 205, 205);</string>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="label_32">
<property name="text">
<string>找零</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_33">
<property name="text">
<string>地面自检</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
App/mainwindow.cpp
+1 -1
View File
@@ -809,7 +809,7 @@ void MainWindow::updateUI()//事件驱动式更新数据
message.append(tr("<h6>数据强度：<font color=red>%1</font>\t").arg(QString::number(100)));
message.append(tr("定位类型：<font color=red>%1</font>\t").arg(gps_str));
message.append(tr("卫星数目：<font color=red>%1</font>颗</h6>").arg(QString::number(dlink->mavlinknode->vehicle.gps_raw_int.satellites_visible)));
message.append(tr("<h6>电池电压：<font color=red>%1</font>V\t").arg(QString::number(dlink->mavlinknode->vehicle.sys_status.voltage_battery * 0.01)));
message.append(tr("<h6>电池电压：<font color=red>%1</font>V\t").arg(QString::number(dlink->mavlinknode->vehicle.sys_status.voltage_battery * 0.001)));
message.append(tr("剩余时间：<font color=red>%1</font></h6>").arg(QString::number(0)));
showMessage(message);