添加估计燃油

App/StatusUI/StatusUI.cpp

@@ -92,11 +92,19 @@ StatusUI::StatusUI(QWidget *parent) :
                                                 {0.4,StateWidget::state::orange},
                                                 {100,StateWidget::state::green}});
 
-    install(state,0,"剩余油量[kg]",0,
+    install(state,0,"采集剩余油量[kg]",0,
              QMap<QVariant, StateWidget::state>{{20,StateWidget::state::red},
                                                 {40,StateWidget::state::orange},
                                                 {800,StateWidget::state::green}});
 
+    install(state,0,"模型剩余油量[kg]",0,
+             QMap<QVariant, StateWidget::state>{{20,StateWidget::state::red},
+                                                {40,StateWidget::state::orange},
+                                                {800,StateWidget::state::green}});
+
+    install(state,0,"油量使用值",0,QMap<QVariant, StateWidget::state>{{"使用采集油量",StateWidget::state::orange},{"使用模型油量",StateWidget::state::green}});
+
+
 
 
 

App/mainwindow.cpp

@@ -1477,7 +1477,7 @@ void MainWindow::update_servo_output_raw(int sysid,mavlink_servo_output_raw_t se
       statusui->setValue(0,2,5,QString::number((int16_t)servo.servo13_raw));//temp 涡轮后温度
       statusui->setValue(0,2,6,QString::number((int16_t)servo.servo14_raw));//oil 滑油压力
 
-      statusui->setValue(0,2,8,QString::number(servo.servo9_raw * 0.01));
+      statusui->setValue(0,2,8,QString::number(servo.servo9_raw * 0.01,'f',2));
 
        emit setECUTemp((int16_t)servo.servo13_raw,(int16_t)servo.servo14_raw);
 
@@ -1486,7 +1486,9 @@ void MainWindow::update_servo_output_raw(int sysid,mavlink_servo_output_raw_t se
     {
         //bear_state 1
         //gs_c 2
+        //fuel_est
        statusui->setValue(1,2,0,QString::number(servo.servo2_raw * 0.01,'f',2));
+       statusui->setValue(0,2,9,QString::number(servo.servo3_raw * 0.01,'f',2));
 
     }
 }
@@ -1999,13 +2001,12 @@ void MainWindow::updateVehicle(MavLinkNode::_vehicle vehicle)//事件驱动式
         */
 
 
-
         statusui->setValue(1,2,1,getBit(health,8)?("使用地速"):("使用空速"));//速度源
         statusui->setValue(1,2,2,getBit(health,7)?("使用SBG"):("使用320"));//姿态源
         statusui->setValue(1,2,3,getBit(health,3)?("使用SBG"):("使用320"));//导航源
 
-
         statusui->setValue(1,3,0,getBit(health,9)?("在安控区内"):("超出安控区"));
+        statusui->setValue(0,2,10,getBit(health,10)?("使用采集油量"):("使用模型油量"));
 
     }