From eb3f4b94b81b0d5fd24c0c6f91f4201d3edd4df9 Mon Sep 17 00:00:00 2001
From: hm-thinkbook14p <gxms0904hm@163.com>
Date: Sat, 3 Jun 2023 17:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=87=BD=E6=95=B0=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E7=A7=92=EF=BC=8C=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=AF=AB=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/ToolsUI/PowerSystem/PowerSystem.cpp | 31 ++++++++++++++++++++++---
 MavLinkNode/mavlinknode.cpp             | 12 +++++++++-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/App/ToolsUI/PowerSystem/PowerSystem.cpp b/App/ToolsUI/PowerSystem/PowerSystem.cpp
index 883453f..7352f12 100644
--- a/App/ToolsUI/PowerSystem/PowerSystem.cpp
+++ b/App/ToolsUI/PowerSystem/PowerSystem.cpp
@@ -2,10 +2,16 @@
 #include "ui_PowerSystem.h"
 
 
+
+QVector<double> test = {1,2,3,4,5,6,7};
+
 double get_mean(QVector<double> in)
 {
     double sum = std::accumulate(in.begin(), in.end(), 0.0);
     double mean =  sum / in.size(); //均值
+
+    qDebug() << in.size() << sum;
+
     return mean;
 }
 
@@ -16,6 +22,15 @@ PowerSystem::PowerSystem(QWidget *parent) :
     ui->setupUi(this);
     m_parent = parent;
 
+    test.clear();
+    for(int i = 1;i<101;i++)
+    {
+        test.append(i);
+    }
+
+
+    qDebug() << "get_mean" << get_mean(test);
+
 
     setWindowTitle(tr("PowerSyste"));
 
@@ -172,7 +187,7 @@ PowerSystem::PowerSystem(QWidget *parent) :
 
        double AMa = get_mean(averageMa);
        ui->label_Average_Ma->setText(QString::number(AMa,'f',3));
-
+       qDebug() << "mach" << AMa;
    });
 
 
@@ -459,13 +474,23 @@ void PowerSystem::setMa(qint64 time, QVariant Ma)
     averageMa.append(Ma.toDouble());
     averageTime.append(time);
 
-    while(averageTime.back() - averageTime.first() > (100 * 1000))
+    /*
+    while(averageTime.size() > 91)
+    {
+        averageTime.removeFirst();
+        averageMa.removeFirst();
+    }
+    */
+
+
+    while(averageTime.back() - averageTime.first() >= (101))
     {
         averageTime.removeFirst();
         averageMa.removeFirst();
     }
 
-    //qDebug() << "size of time:" << averageTime.size() << averageMa.size() << averageTime.back() << averageTime.first();
+
+    qDebug() << "size of time:" << averageTime.size() << averageMa.size() << averageTime.back() << averageTime.first() << (averageTime.back() - averageTime.first());
 
 
 
diff --git a/MavLinkNode/mavlinknode.cpp b/MavLinkNode/mavlinknode.cpp
index fda03ac..d7f4e76 100644
--- a/MavLinkNode/mavlinknode.cpp
+++ b/MavLinkNode/mavlinknode.cpp
@@ -1840,7 +1840,17 @@ void MavLinkNode::StatusParse(mavlink_message_t msg)
             setFileData(emb_atom_com_file,csvdata);
 
 
-            emit setMa(vehicle.timebase, vehicle.emb_atom_com.mach);
+
+
+            QDateTime *timebase = new QDateTime();
+
+
+            timebase->setDate(QDate(gpsTimer.year,gpsTimer.mon,gpsTimer.day));
+            timebase->setTime(QTime(gpsTimer.hour,gpsTimer.min,gpsTimer.sec));
+
+            emit setMa(timebase->toSecsSinceEpoch(), vehicle.emb_atom_com.mach);
+
+            delete timebase;
 
          }break;
          case MAVLINK_MSG_ID_TurbineState: {