From 49825564992c01ab13c3843a6eefda1161445a59 Mon Sep 17 00:00:00 2001 From: hm Date: Wed, 13 Jul 2022 14:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B3=E5=85=89=E7=AE=A1=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/CommandUI/CommandUI.ui | 30 ++- App/ComponentUI/Inputter/Inputter.cpp | 5 +- App/ComponentUI/Inputter/Inputter.ui | 95 +++---- App/GCS_zh_CN.ts | 324 +++++++++++++----------- App/HealthUI/HealthUI.ui | 2 +- App/MissionUI/MissionUI.cpp | 2 +- App/ToolsUI/PowerSystem/PowerSystem.cpp | 4 +- App/ToolsUI/PowerSystem/PowerSystem.ui | 143 +++++------ App/ToolsUI/Senser/inital.png | Bin 0 -> 2509 bytes App/ToolsUI/Senser/warning.png | Bin 0 -> 4155 bytes App/ToolsUI/ServoSystem/ServoSystem.cpp | 73 +++++- App/ToolsUI/ServoSystem/ServoSystem.h | 7 +- App/ToolsUI/ServoSystem/ServoSystem.qrc | 2 + App/ToolsUI/ServoSystem/ServoSystem.qss | 8 + App/ToolsUI/ServoSystem/ServoSystem.ui | 29 ++- App/ToolsUI/ServoSystem/inital.png | Bin 0 -> 2509 bytes App/ToolsUI/ServoSystem/warning.png | Bin 0 -> 4155 bytes App/mainwindow.cpp | 29 ++- MavLinkNode/MAVLINKNODE_zh_CN.qm | Bin 0 -> 106 bytes MavLinkNode/MAVLINKNODE_zh_CN.ts | 41 +++ MavLinkNode/MavLinkNode.pro | 2 +- opmap/MAP_zh_CN.qm | Bin 4510 -> 4584 bytes opmap/MAP_zh_CN.ts | 55 ++-- opmap/mapwidget/opmapwidget.cpp | 4 +- 24 files changed, 501 insertions(+), 354 deletions(-) create mode 100644 App/ToolsUI/Senser/inital.png create mode 100644 App/ToolsUI/Senser/warning.png create mode 100644 App/ToolsUI/ServoSystem/inital.png create mode 100644 App/ToolsUI/ServoSystem/warning.png create mode 100644 MavLinkNode/MAVLINKNODE_zh_CN.qm create mode 100644 MavLinkNode/MAVLINKNODE_zh_CN.ts diff --git a/App/CommandUI/CommandUI.ui b/App/CommandUI/CommandUI.ui index a47d83f..678f430 100644 --- a/App/CommandUI/CommandUI.ui +++ b/App/CommandUI/CommandUI.ui @@ -32,10 +32,23 @@ - + + + + 50 + 16777215 + + + + + + 100 + 16777215 + + 切换无人机 @@ -47,13 +60,26 @@ + + + 80 + 16777215 + + 切换航点 - + + + + 60 + 16777215 + + + diff --git a/App/ComponentUI/Inputter/Inputter.cpp b/App/ComponentUI/Inputter/Inputter.cpp index 2123f25..f18fff5 100644 --- a/App/ComponentUI/Inputter/Inputter.cpp +++ b/App/ComponentUI/Inputter/Inputter.cpp @@ -50,7 +50,6 @@ Inputter::~Inputter() delete DoubleClickTimer; } - delete ui; } @@ -60,7 +59,7 @@ bool Inputter::event(QEvent *event) if(event->type() == QEvent::Leave) { - //this->close(); + //this->close();//鼠标离开立即关闭 } return QWidget::event(event); } @@ -142,7 +141,7 @@ void Inputter::setInputType(int Type) break; case 1: inputType = type::MAC; - ui->pushButton_nan->setEnabled(false); + //ui->pushButton_nan->setEnabled(false);//去除nan按键 ui->pushButton_minus->setEnabled(false); break; } diff --git a/App/ComponentUI/Inputter/Inputter.ui b/App/ComponentUI/Inputter/Inputter.ui index 007e4aa..34e12ab 100644 --- a/App/ComponentUI/Inputter/Inputter.ui +++ b/App/ComponentUI/Inputter/Inputter.ui @@ -185,25 +185,6 @@ - - - - - 80 - 20 - - - - - 100 - 100 - - - - 0 - - - @@ -242,25 +223,6 @@ - - - - - 80 - 20 - - - - - 100 - 100 - - - - nan - - - @@ -331,25 +293,6 @@ - - - - - 80 - 20 - - - - - 100 - 100 - - - - . - - - @@ -401,6 +344,44 @@ + + + + + 80 + 20 + + + + + 100 + 100 + + + + . + + + + + + + + 80 + 20 + + + + + 200 + 100 + + + + 0 + + + diff --git a/App/GCS_zh_CN.ts b/App/GCS_zh_CN.ts index 4d490ec..f3aef13 100644 --- a/App/GCS_zh_CN.ts +++ b/App/GCS_zh_CN.ts @@ -510,17 +510,17 @@ 请不要操作过快，上一个指令未发送完成 - + set mission :group %1,point %2 设置 第%1组，第%2点 - + point: 航点： - + click confirm to set uav %1 as current 点击选择%1无人机 @@ -549,7 +549,7 @@ %1 正在执行 - + click confirm to set group %1 Point %2 as current point click confirm to set Point %1 as current point 点击设置第%1组，航点%2为当前航点 @@ -3985,269 +3985,269 @@ Circle(radius) 伺服界面 - + 舵机 - - - - - + + + + + 上电自检 - + 左副翼 - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 0 0 - - - - - + + + + + 指令位 - - - - - + + + + + 地面自检 - - - - - + + + + + 当前位 - - - - - + + + + + 找零 - + 右升降 - + 右副翼 - + 左升降 - + 发动机指令 发动机指令 - + 控制指令 - + 紧急停车 - + 停车 - + 冷运转 - + 关加力 - + 全加力档 - + 半加力档 - + 半加力 - + 全加力 - - + + 给定转速 - + 地面起动 - + 测试指令 - + 测试 - + 测试项 - + 测试值 - + 油量校准 - + 千克 - + 油量 - + 油量设定 - + 参数设置 - + 无人机# - + 外置大气机 - + 选择惯导 - + 选择 - + IAS_SEL - + 地速算空速 - + 内置大气机 - + 加热关闭 - + 加热打开 加热1开 - + 电源指令 - + 500瓦打开 - + 500瓦关闭 - + 500瓦电源 500W电源 @@ -4318,53 +4318,53 @@ Circle(radius) - + 扫频设置 - + 副翼 - + 升降 - - + + 方向舵 - + 幅值 - + 结束频率（Hz） - + 开始频率（Hz） - + 扫频频率变化率（Hz/s） - + 开始测试 - + 停止测试 @@ -4384,63 +4384,78 @@ Circle(radius) - + + 曳光管指令 + + + + + 发射曳光管 + + + + + 曳光管 + + + + 500瓦开 - + 版本信息 - + 飞控固件版本号： - + HIL模式状态： - + 电源 - + 28V剩余电量（%） - + 56V模块温度(℃) - + 机载28V电压（V） 机载28V电压 - + 56V剩余电量（%） - + 28V模块温度(℃) - + 状态 - + 28V电源 @@ -4461,33 +4476,33 @@ Circle(radius) 5803A - + 机载电源 - + 机载56V电压（V） - + 机载56V电流（A） - + 机载28V电流（A） - + 56V电源 - - + + 空速管加热 @@ -4499,7 +4514,7 @@ Circle(radius) - + time: %1 s 加热时间： %1 秒 @@ -4554,100 +4569,101 @@ Circle(radius) 请不要操作过快，上一个指令未发送完成 - + please set command first ,command :%1 请设置指令，当前指令号为 %1 - + 发送指令 - + 修改参数 - - - - - - - - + + + + + + + + 警告 - - + + 请选择测试项和测试点 - + 请设定给定转速 - - - - + + + + 请设定目标 - + 设定舵机 %1 %2 - + 请设定 - + 设定舵机归零 %1 - + %1 %2kg - - - - - - - - + + + + + + + + + 设定 %1 - + airspeed head warning 空速管加热警告 - + airspeed head can only support 30s since it opening,so it must be turn off after 30s 空速管在地面只能加热不超过30秒，在地面加热超过30秒后请立即关闭加热功能，避免空速管损坏 - + ok 确定 - + cancel 取消 diff --git a/App/HealthUI/HealthUI.ui b/App/HealthUI/HealthUI.ui index 9e01d95..66f2856 100644 --- a/App/HealthUI/HealthUI.ui +++ b/App/HealthUI/HealthUI.ui @@ -338,7 +338,7 @@ background-color: rgb(205, 205, 205); - 大气机 + 空速管加热 Qt::AlignCenter diff --git a/App/MissionUI/MissionUI.cpp b/App/MissionUI/MissionUI.cpp index 56fcb6d..a86bb68 100644 --- a/App/MissionUI/MissionUI.cpp +++ b/App/MissionUI/MissionUI.cpp @@ -468,7 +468,7 @@ MissionUI::MissionUI(QWidget *parent) : btn_download->show(); btn_insert->hide(); btn_delete->show(); - btn_clean->hide(); + //btn_clean->hide(); btn_add->hide(); } else if(index <= 4) diff --git a/App/ToolsUI/PowerSystem/PowerSystem.cpp b/App/ToolsUI/PowerSystem/PowerSystem.cpp index 8c12b9c..dda8e89 100644 --- a/App/ToolsUI/PowerSystem/PowerSystem.cpp +++ b/App/ToolsUI/PowerSystem/PowerSystem.cpp @@ -49,7 +49,7 @@ PowerSystem::PowerSystem(QWidget *parent) : setColor(ui->checkBox_12,state::success); setColor(ui->checkBox_13,state::success); setColor(ui->checkBox_14,state::success); - setColor(ui->checkBox_15,state::success); + //setColor(ui->checkBox_15,state::success); setColor(ui->checkBox_16,state::success); setColor(ui->checkBox_17,state::success); setColor(ui->checkBox_18,state::success); @@ -340,7 +340,7 @@ void PowerSystem::setTurbineState(mavlink_turbinestate_t *t) setColor(ui->checkBox_12,((t->Fault & 0x0010) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_13,((t->Fault & 0x0020) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_14,((t->Fault & 0x0040) > 0)?(state::failure):(state::success)); - setColor(ui->checkBox_15,((t->Fault & 0x0080) > 0)?(state::failure):(state::success)); + //setColor(ui->checkBox_15,((t->Fault & 0x0080) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_16,((t->Fault & 0x0100) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_17,((t->Fault & 0x0200) > 0)?(state::failure):(state::success)); setColor(ui->checkBox_18,((t->Fault & 0x0400) > 0)?(state::failure):(state::success)); diff --git a/App/ToolsUI/PowerSystem/PowerSystem.ui b/App/ToolsUI/PowerSystem/PowerSystem.ui index f9d5a60..a89434c 100644 --- a/App/ToolsUI/PowerSystem/PowerSystem.ui +++ b/App/ToolsUI/PowerSystem/PowerSystem.ui @@ -1126,66 +1126,6 @@ Qt::AlignCenter - - - - N1转速传感器 - - - false - - - - - - - 核心机主油泵输出 - - - false - - - - - - - 舵机控制器 - - - false - - - - - - - N2转速传感器 - - - false - - - - - - - 加力点火油泵输出 - - - false - - - - - - - 舵机位移传感器 - - - false - - - @@ -1205,6 +1145,16 @@ + + + + P1t进口总压传感器 + + + false + + + @@ -1215,20 +1165,40 @@ - - + + - 电源 + 舵机控制器 false - - + + - 加力主油泵输出 + P5t涡轮后压力感器 + + + false + + + + + + + 核心机主油泵输出 + + + false + + + + + + + 舵机位移传感器 false @@ -1245,39 +1215,50 @@ - - + + - P1t进口总压传感器 + N1转速传感器 false - - + + - P3t出口总压传感器 + 加力点火油泵输出 false - - false + + + + + + 加力主油泵输出 - - false - - + false - - + + - P5t涡轮后压力感器 + 电源 + + + false + + + + + + + N2转速传感器 false diff --git a/App/ToolsUI/Senser/inital.png b/App/ToolsUI/Senser/inital.png new file mode 100644 index 0000000000000000000000000000000000000000..c34080322a801d20479f89d1c331348b01de133c GIT binary patch literal 2509 zcmcIm4Nwzj8s3Bi3JNGn`L)I^Lamo%H$X@h0tmqnFhG$)6tBl-vk56lHYC9$h&Fh= z0|bBS73Qo^EMT!Jj2$ZCaZ1DrJ?T;DU5gx4gJ7Xn2C%1aigUN&Z|seCo$Ji)%=iC% z&-?Se?>k$TmLhU@^LGOPz+IduOee=QM|;7U><_Je&_oWdy2Kp@09dic(I~)s)xH2g ze^HeoHA*Gh5RA~UP&pyPS!RunL<2xnj9G_bdAN}w!<8zn0Gw>^02wN|0L%)PKoVU% zo~ueM)Z^O=Q!=o^Jd7^~W1<;RW`rcr;6{{T)~K}x#4G^kc@c8%*k*%_d5AGj0B&&z zWJo1xjCewiGq@~>i9ryD5y5A{+^{en?-vXX#DUmQ1RI8!91a3;k?>H);s=t_^l}A~ zF5J2(i(Co7T%%Eku-PV)iDe395qc#X=JWY%h{NV^m?VN}uxO2_nW;6ryu={H4VYe~ zGpYzJ!@-EkhytSkBsEH06LynkEIQ=5XhViYhqKdh z15u#I@Pyr@nlC%7(IN4A95oX941!QEJyhC~$_x&N1uBjj2tzhKM9s&h=R~-P|{$P z236v0omL4lmfeWN6KXak}`Lkz|dkIcf z499f2RFRA2Vux$V3a2Ma+4qv0tpGs#rC7Kn!(2U4bBPE{@GYse%oKe(J&;+t2@KpN zO%h5TxC9lf6~?a}Kk=E%5rp1(;Dor+x!iZdD7b3-hJ-j{L!u}y6}%YBOTv1RdRL8U zO}~|CC$3%Y`NmQ`IM_b3X+|-2%koKkOXxM?&j{myufMy8R%Iouwbo79r>V|m zA-04kY5Qu2!JzkPEBBq(@43acyfrV$|g?yl2>6hp~G1>W=}R zX_g09GdL=BZF8^APw(a(X?Sq`z(iKiM>&DKkDRKnL=F^ethyJiURcU6o$e6}EreCw3H7ggjZa-v!^7ZRg9x+q0&n_4$cc|o#z zCBHH=(ErfZsa~kOyqr2m--aE%QY5~W+Pba@2>q`4`X|4WRQ9{FlKOl9ViQwRoOqUZ zlskR{j@)|}m;`*YdYewvy^~)MXB~9ykGQ?}TQ9LB5ADsSIXx0U~=ZOWS#pVxBUq-OlkTxZLmn~$2j>ED(C zp2cw`r4Qe$I8#EMqu48=-6A)R+$*+Ub%9%N8`eB2sW{V4o%1-`uv(WC;NSPw?2WP~ zUzT3_BR!}7U{vyEnxE*x*UB;VV^HAv*PvscHJ+w!n5NB|#w<7AC_4+>9&YV)sSIw| z@UCqpOrP13e35MpFYC@P+&tN-DM@Rl)HZgvQ2VW^lymj5{be?%3Js59ce~|%Zcixc zDuq~`;-UIGkJpF5U5&`z6?4CT+BBg3+}nQWUwB;Z-j%O**lX_ZY(D=t&p98nj}%IQ#P}(NGW)dbXj0)I3z!_P zxqk-_I9*Ugo3iA5^+jxN$?KkX4&afcku{pEV$Ug$drc|d%SDB*=72WW4}+&iGigJy z30DZ0{C?~4S@^cLU(}fW_{{95T|4Z^l-XWqf7-vUd8FIy8uRU=y|jHEBVp0elfKbM v&h0}DifGcq!6*dNJeXZlxmDKH9V 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 literal 0 HcmV?d00001 diff --git a/App/ToolsUI/ServoSystem/ServoSystem.cpp b/App/ToolsUI/ServoSystem/ServoSystem.cpp index b598ec1..f509e06 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.cpp +++ b/App/ToolsUI/ServoSystem/ServoSystem.cpp @@ -19,13 +19,12 @@ ServoSystem::ServoSystem(QWidget *parent) : file.close(); //======== - setColor(ui->checkBox_onBoard,state::success); - setColor(ui->checkBox_28v,state::success); - setColor(ui->checkBox_56v,state::success); - setColor(ui->checkBox_AirSpeed,state::success); - setColor(ui->checkBox_500W,state::failure); - - //setColor(ui->label_LE_SBIT,state::failure); + setColor(ui->checkBox_onBoard,state::inital); + setColor(ui->checkBox_28v,state::inital); + setColor(ui->checkBox_56v,state::inital); + setColor(ui->checkBox_AirSpeed,state::inital); + setColor(ui->checkBox_500W,state::inital); + setColor(ui->checkBox_Tracer,state::inital); setCheckState(6,state::failure); @@ -296,13 +295,13 @@ void ServoSystem::setCheckState(uint32_t pos,QVariant value) setColor(ui->checkBox_56v,(value.toBool())?(state::success):(state::failure)); break; case 4: - setColor(ui->checkBox_AirSpeed,(value.toBool())?(state::success):(state::failure)); + setColor(ui->checkBox_AirSpeed,(value.toBool())?(state::success):(state::inital)); break; case 5: - setColor(ui->checkBox_500W,(value.toBool())?(state::success):(state::failure)); + setColor(ui->checkBox_500W,(value.toBool())?(state::success):(state::inital)); break; case 6: - //setColor(ui->checkBox_5525D,(value.toBool())?(state::success):(state::failure)); + //setColor(ui->checkBox_Tracer,(value.toBool())?(state::success):(state::failure)); break; case 7: //setColor(ui->checkBox_5803A,(value.toBool())?(state::success):(state::failure)); @@ -380,6 +379,11 @@ void ServoSystem::setServoState(mavlink_servo_output_raw_t *t) } +void ServoSystem::setCCMState(mavlink_ccmstate_t *t) +{ + //判断echo_seq,是否一直在增加 + +} void ServoSystem::setAPversion(QString ver) { @@ -537,6 +541,29 @@ void ServoSystem::commandAccepted(bool flag,uint16_t command,uint8_t result) m_command = 0; m_confirm = 0; + if(isWaitPitotAck == true) + { + if(result == MAV_RESULT_ACCEPTED)//已经正确执行 + { + isWaitPitotAck = false; + setColor(ui->checkBox_AirSpeed,state::success); + } + else if(result == MAV_RESULT_ACCEPTED)//已经正确执行 + { + isWaitPitotAck = false; + setColor(ui->checkBox_AirSpeed,state::success); + } + } + + if(isWaitTracerAck == true) + { + if(result == MAV_RESULT_ACCEPTED)//已经正确执行 + { + isWaitTracerAck = false; + setColor(ui->checkBox_Tracer,state::success); + } + } + } if(string.size() > 0) @@ -657,11 +684,16 @@ void ServoSystem::on_pushButton_SendCommand_clicked() if(cmdType == 0) { - emit showMessage(tr("发送指令 ") + QString::number(m_command) + " " + m_name,5000); - emit cmd_long(m_param1,m_param2,m_param3,m_param4,m_param5,m_param6,m_param7,m_command,m_confirm); - if(m_name == ui->pushButton_AirHeatOn->text()) + + QString name = m_name.split(' ',QString::SkipEmptyParts).last(); + + //qDebug() << m_name << name; + + if(name == ui->pushButton_AirHeatOn->text()) { + isWaitPitotAck = true; + if((tim)&&(tim->isActive())) { tim->stop(); @@ -670,8 +702,9 @@ void ServoSystem::on_pushButton_SendCommand_clicked() heatCount = 0; tim->start(); } - else if(m_name == ui->pushButton_HeatOff->text()) + else if(name == ui->pushButton_HeatOff->text()) { + setColor(ui->checkBox_AirSpeed,state::inital); if((tim)&&(tim->isActive())) { tim->stop(); @@ -679,6 +712,14 @@ void ServoSystem::on_pushButton_SendCommand_clicked() ui->label_heatTime->setText(tr("time: %1 s").arg(heatCount)); } } + else if(name == ui->pushButton_tracer->text()) + { + isWaitTracerAck = true; + //qDebug() << "wait for tracer"; + } + + emit showMessage(tr("发送指令 ") + QString::number(m_command) + " " + m_name,5000); + emit cmd_long(m_param1,m_param2,m_param3,m_param4,m_param5,m_param6,m_param7,m_command,m_confirm); } else if(cmdType == 1) @@ -1143,6 +1184,8 @@ void ServoSystem::on_pushButton_AirHeatOn_clicked() if(rst == QMessageBox::AcceptRole) { + + on_commandClicked(ui->pushButton_AirHeatOn->text(), 1,1,0,0,0,0,0,20005,0); @@ -1237,6 +1280,8 @@ void ServoSystem::on_pushButton_500W_Close_clicked() void ServoSystem::on_pushButton_tracer_clicked() { + + on_commandClicked(tr("设定 %1").arg(ui->pushButton_tracer->text()), 0,0,0,0,0,0,0,20013,0); } diff --git a/App/ToolsUI/ServoSystem/ServoSystem.h b/App/ToolsUI/ServoSystem/ServoSystem.h index 09489a7..996551a 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.h +++ b/App/ToolsUI/ServoSystem/ServoSystem.h @@ -42,6 +42,8 @@ public: enum state{ success = 0, failure, + warning, + inital, }; explicit ServoSystem(QWidget *parent = nullptr); @@ -140,6 +142,7 @@ public slots: void setCheckState(uint32_t pos,QVariant value); void setBUMState(mavlink_bmustate_t *t); + void setCCMState(mavlink_ccmstate_t *t); void setServoState(mavlink_servo_output_raw_t *t); @@ -230,7 +233,9 @@ private: int heatCount = 30; QTimer *tim = nullptr; - + bool isWaitPitotAck = false; + bool isWaitPitotClose = true; + bool isWaitTracerAck = false; }; diff --git a/App/ToolsUI/ServoSystem/ServoSystem.qrc b/App/ToolsUI/ServoSystem/ServoSystem.qrc index 137188b..12ccc52 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.qrc +++ b/App/ToolsUI/ServoSystem/ServoSystem.qrc @@ -8,5 +8,7 @@ fail_rect.png success_rect.png warning_rect.png + inital.png + warning.png diff --git a/App/ToolsUI/ServoSystem/ServoSystem.qss b/App/ToolsUI/ServoSystem/ServoSystem.qss index 585ba23..9f37083 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.qss +++ b/App/ToolsUI/ServoSystem/ServoSystem.qss @@ -88,4 +88,12 @@ image:url(:/img/fail.png); } +.QCheckBox::indicator[state="2"] { + image:url(:/img/warning.png); +} + +.QCheckBox::indicator[state="3"] { + image:url(:/img/inital.png); +} + diff --git a/App/ToolsUI/ServoSystem/ServoSystem.ui b/App/ToolsUI/ServoSystem/ServoSystem.ui index 9cf0abd..d2e83bd 100644 --- a/App/ToolsUI/ServoSystem/ServoSystem.ui +++ b/App/ToolsUI/ServoSystem/ServoSystem.ui @@ -6,8 +6,8 @@ 0 0 - 1574 - 782 + 1556 + 841 @@ -761,7 +761,7 @@ - 发射曳光管 + 点亮曳光管 @@ -823,7 +823,14 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - + + + + 56V电源 + + + + Qt::Vertical @@ -850,13 +857,6 @@ - - - - 56V电源 - - - @@ -871,6 +871,13 @@ + + + + 曳光管 + + + diff --git a/App/ToolsUI/ServoSystem/inital.png b/App/ToolsUI/ServoSystem/inital.png new file mode 100644 index 0000000000000000000000000000000000000000..c34080322a801d20479f89d1c331348b01de133c GIT binary patch literal 2509 zcmcIm4Nwzj8s3Bi3JNGn`L)I^Lamo%H$X@h0tmqnFhG$)6tBl-vk56lHYC9$h&Fh= z0|bBS73Qo^EMT!Jj2$ZCaZ1DrJ?T;DU5gx4gJ7Xn2C%1aigUN&Z|seCo$Ji)%=iC% z&-?Se?>k$TmLhU@^LGOPz+IduOee=QM|;7U><_Je&_oWdy2Kp@09dic(I~)s)xH2g ze^HeoHA*Gh5RA~UP&pyPS!RunL<2xnj9G_bdAN}w!<8zn0Gw>^02wN|0L%)PKoVU% zo~ueM)Z^O=Q!=o^Jd7^~W1<;RW`rcr;6{{T)~K}x#4G^kc@c8%*k*%_d5AGj0B&&z zWJo1xjCewiGq@~>i9ryD5y5A{+^{en?-vXX#DUmQ1RI8!91a3;k?>H);s=t_^l}A~ zF5J2(i(Co7T%%Eku-PV)iDe395qc#X=JWY%h{NV^m?VN}uxO2_nW;6ryu={H4VYe~ zGpYzJ!@-EkhytSkBsEH06LynkEIQ=5XhViYhqKdh z15u#I@Pyr@nlC%7(IN4A95oX941!QEJyhC~$_x&N1uBjj2tzhKM9s&h=R~-P|{$P z236v0omL4lmfeWN6KXak}`Lkz|dkIcf z499f2RFRA2Vux$V3a2Ma+4qv0tpGs#rC7Kn!(2U4bBPE{@GYse%oKe(J&;+t2@KpN zO%h5TxC9lf6~?a}Kk=E%5rp1(;Dor+x!iZdD7b3-hJ-j{L!u}y6}%YBOTv1RdRL8U zO}~|CC$3%Y`NmQ`IM_b3X+|-2%koKkOXxM?&j{myufMy8R%Iouwbo79r>V|m zA-04kY5Qu2!JzkPEBBq(@43acyfrV$|g?yl2>6hp~G1>W=}R zX_g09GdL=BZF8^APw(a(X?Sq`z(iKiM>&DKkDRKnL=F^ethyJiURcU6o$e6}EreCw3H7ggjZa-v!^7ZRg9x+q0&n_4$cc|o#z zCBHH=(ErfZsa~kOyqr2m--aE%QY5~W+Pba@2>q`4`X|4WRQ9{FlKOl9ViQwRoOqUZ zlskR{j@)|}m;`*YdYewvy^~)MXB~9ykGQ?}TQ9LB5ADsSIXx0U~=ZOWS#pVxBUq-OlkTxZLmn~$2j>ED(C zp2cw`r4Qe$I8#EMqu48=-6A)R+$*+Ub%9%N8`eB2sW{V4o%1-`uv(WC;NSPw?2WP~ zUzT3_BR!}7U{vyEnxE*x*UB;VV^HAv*PvscHJ+w!n5NB|#w<7AC_4+>9&YV)sSIw| z@UCqpOrP13e35MpFYC@P+&tN-DM@Rl)HZgvQ2VW^lymj5{be?%3Js59ce~|%Zcixc zDuq~`;-UIGkJpF5U5&`z6?4CT+BBg3+}nQWUwB;Z-j%O**lX_ZY(D=t&p98nj}%IQ#P}(NGW)dbXj0)I3z!_P zxqk-_I9*Ugo3iA5^+jxN$?KkX4&afcku{pEV$Ug$drc|d%SDB*=72WW4}+&iGigJy z30DZ0{C?~4S@^cLU(}fW_{{95T|4Z^l-XWqf7-vUd8FIy8uRU=y|jHEBVp0elfKbM v&h0}DifGcq!6*dNJeXZlxmDKH9V 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 literal 0 HcmV?d00001 diff --git a/App/mainwindow.cpp b/App/mainwindow.cpp index d1d9bf2..2045010 100644 --- a/App/mainwindow.cpp +++ b/App/mainwindow.cpp @@ -1515,6 +1515,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 QString::number(vehicle.ccmstate.fuel_level * 10.0 / 65536.0f,'f',1)); toolsui->servosystem->setBUMState(&vehicle.bmustate); + toolsui->servosystem->setCCMState(&vehicle.ccmstate); //在这里设置 toolsui->servosystem->setServoState(&vehicle.servo_output_raw); @@ -1530,7 +1531,31 @@ void MainWindow::updateUI()//事件驱动式更新数据 toolsui->servosystem->setCheckState(1,v28_Low || v56_Low); toolsui->servosystem->setCheckState(2,v28_Low); toolsui->servosystem->setCheckState(3,v56_Low); - toolsui->servosystem->setCheckState(4,0); + + //两秒检测一次，如果两秒内，数据变化，说明在加热 + static qint64 echo_time = 0; + static uint8_t echo_seq_old = 0; + if((QDateTime::currentMSecsSinceEpoch() - echo_time) >= 3000) + { + if(vehicle.ccmstate.echo_seq != echo_seq_old) + { + toolsui->servosystem->setCheckState(4,1);//空速管加热 + healthui->setState(7,HealthUI::state::success);//AIR + + echo_seq_old = vehicle.ccmstate.echo_seq; + + } + else + { + toolsui->servosystem->setCheckState(4,0);//空速管不加热 + healthui->setState(7,HealthUI::state::inital);//AIR + + } + + + } + echo_time = QDateTime::currentMSecsSinceEpoch(); + @@ -1559,7 +1584,7 @@ void MainWindow::updateUI()//事件驱动式更新数据 // 22 23 24 25 26 27 28 29 // 5525D 5803A 5607A 4525D atteck slide 解码 通讯 - healthui->setState(7,getBit(health,29)?(getBit(health,28)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//AIR + //healthui->setState(7,getBit(health,29)?(getBit(health,28)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//AIR healthui->setState(8,getBit(health,5)?(getBit(health,11)?(HealthUI::state::success):(HealthUI::state::warning)):(HealthUI::state::failure));//FL diff --git a/MavLinkNode/MAVLINKNODE_zh_CN.qm b/MavLinkNode/MAVLINKNODE_zh_CN.qm new file mode 100644 index 0000000000000000000000000000000000000000..f4f5c8db13066d87bb0f606aa292a68381cfd63b GIT binary patch literal 106 zcmcE7ks@*G{hX<16=n7(EZlq7iGhKEgMF(FCy-{y1Y!?nAi + + + + MavLinkNode + + + 出现新的设备,识别号为 %1 + + + + + MissionProcess + + + this mission group is empty + 本航线为空 + + + + ParameterProcess + + + 收到参数 %1 %2 %3 + + + + + Replay + + + Error + + + + + %1 + + + + diff --git a/MavLinkNode/MavLinkNode.pro b/MavLinkNode/MavLinkNode.pro index cb3399f..cd916dd 100644 --- a/MavLinkNode/MavLinkNode.pro +++ b/MavLinkNode/MavLinkNode.pro @@ -130,7 +130,7 @@ unix { system(cp $$src_dir $$dst_dir -arf ) } - +TRANSLATIONS += MAVLINKNODE_zh_CN.ts diff --git a/opmap/MAP_zh_CN.qm b/opmap/MAP_zh_CN.qm index ccf83ebc736693cf313102d7a0bdf9962419cd3b..bab6b7fad9d4631df3882011433070ddedcff9ed 100644 GIT binary patch delta 335 zcmbQI{6cwxi026g1_mw$2F^5~Nv3_Mz#W(N!y82D8tuT$&;@(Bxj*d!iuZDRO;!ZbuG|}c9b#aZ+{~!RIiDve>;cfuyOY;4ii;KSXE00v z`ci?v{a*l(zLm+qAi%cy79%@{B8MNBze1B%!A=ff_%N`60;#khCqFSo!8fzGI5R(Q J^8wC#>;SU`RtNw9 delta 325 zcmaE%JWqLoi01(Y1_mw$2F?i#4ADR)Un~Pd>?)wpWCpewRzUhBLsX?IP+Wx}nz@UC zfnzU2R&xjg1J6x{{3I_125tt1GF2@gy>4QxKBMHsUUg1hR?}BW3=E8n6OXFbSFpz{ z1xXjP9}il{z`(MBgL(52AT7Wl6RiL=Mv23lc>_@1f@96y?+gsQAsnYq76AD#IL!_i z0Ihw*X{ph~z`!2KS*5=SX#FP$&3S;c?pGoM18WUu-%(+pGrc(H{Con`Kbebba}`is z3s-IDBnAd4PAjgH?R`Mk?B(YEv(Ai{%LldjNFCY@TWzpe%zX wZ=C{A8=D{Bcas1H27W#M42B6nWAE{|{{!;*W@G{dk8FO#$j-4@n`停止缓存地图 - + Load Geo Fence File :%1 导入围栏文件：%1 - + Load Mission File:Group %1,%2 导入航线文件：第%1组航线，%2 - + Save Fence File:%1 保存围栏文件：%1 - + Save Mission File:Group %1,%2 保存航线文件：第%1组航线，%2 - + please load fence first 请先导入围栏 - + start upload fence,total:%1 开始上传围栏，总数%1 - + please load mission first 请先导入航线 - + start upload mission %1,total %2 开始上传航线%1，总数%2 - + + upload Mission + 上传航点 + + + upload fail %1 上传失败 %1 - + recieve fence polygon inclusion: %1 接收到多边形安控区 ：%1 - + recieve fence polygon exclusion: %1 接收到多边形禁飞区 ：%1 - + recieve fence circle inclusion: %1 接收到圆形安控区 ：%1 - + recieve fence circle exclusion: %1 接收到圆形禁飞区 ：%1 @@ -162,7 +167,7 @@ Please first select the area of the map to rip with <CTRL>+Left mouse clic 围栏 - + recieve way point group:%1 seq:%2 收到航点：第%1组，第%2点 @@ -244,6 +249,10 @@ Ma:%2 + + + + Ma: %1 马赫：%1 @@ -255,28 +264,28 @@ Ma:%2 - + onAB 开加力 - + offAB 关加力 - + unknow 未知指令 - + @@ -284,15 +293,15 @@ Ma:%2 - - - - + + + + Speed: %1m/s 速度：%1m/s - + Height: %1m %2 高度：%1m diff --git a/opmap/mapwidget/opmapwidget.cpp b/opmap/mapwidget/opmapwidget.cpp index e20a7ef..0726c98 100644 --- a/opmap/mapwidget/opmapwidget.cpp +++ b/opmap/mapwidget/opmapwidget.cpp @@ -1409,6 +1409,8 @@ void OPMapWidget::WPDeleteAll() delete w; } } + + fenceCount = 1; } @@ -2970,7 +2972,7 @@ void OPMapWidget::WPGroup(int value) if(flag == true) { QString str; - str.append("upload Mission"); + str.append(tr("upload Mission")); str.append(QString::number(seq)); emit showMessage(str); }