From 061e1f83bd063fe807af6582c26424e07f37259f Mon Sep 17 00:00:00 2001
From: tangchao0503 <735056338@qq.com>
Date: Wed, 25 Oct 2023 15:34:19 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E8=AE=B0=E5=BD=95cpu=E6=B8=A9?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Source_Files/main.cpp        |  2 +-
 Source_Files/ximeaimager.cpp | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Source_Files/main.cpp b/Source_Files/main.cpp
index efb0d1d..70181f3 100644
--- a/Source_Files/main.cpp
+++ b/Source_Files/main.cpp
@@ -3,7 +3,7 @@
 
 int main(int argc, char *argv[])
 {
-    std::cout<<"ximeaAirborneSystem 版本："<< "40." <<std::endl;
+    std::cout<<"ximeaAirborneSystem 版本："<< "41." <<std::endl;
     QCoreApplication a(argc, argv);
 
     //UdpServer* x=new UdpServer();
diff --git a/Source_Files/ximeaimager.cpp b/Source_Files/ximeaimager.cpp
index 9516d87..3d38eaa 100644
--- a/Source_Files/ximeaimager.cpp
+++ b/Source_Files/ximeaimager.cpp
@@ -940,10 +940,27 @@ void RecordXimeaTemperature::recordTemperature(QString filePath= nullptr)
             system("/home/300tc/projects/udpClient/udpClient 127.0.0.1 2");
         }
 
+        // 获取剩余硬盘空间和剩余采集时间
+        FILE *fp;
+        char buffer[128];
+        fp = popen("cat /sys/devices/virtual/thermal/thermal_zone1/temp", "r");
+        if (fp == NULL) {
+            perror("popen");
+        }
+
+        // 读取输出并处理
+        unsigned long long temper;
+        if (fgets(buffer, sizeof(buffer), fp) != NULL)
+        {
+            temper = strtoull(buffer, NULL, 10);
+//            printf("CPU温度: %.2f;\n", (float)temper/1000);
+        }
+        pclose(fp);
+
         QDateTime curDateTime = QDateTime::currentDateTime();
         QString currentTime = curDateTime.toString("yyyy/MM/dd hh:mm:ss");
 
-        ximeaTemperatureFile << currentTime.toStdString() << "," << temp << "\n";
+        ximeaTemperatureFile << currentTime.toStdString() << "," << temp << "," << (float)temper/1000 << "\n";
 
 //        std::cout<<"RecordXimeaTemperature::recordTemperature----------------:ximea Temperature is "<< temp <<std::endl;
 //        std::cout<<"RecordXimeaTemperature::recordTemperature----------------:ximea state is "<< m_ximeaImager->getImagerState() <<std::endl;