zhunk 2 ヶ月 前
親
コミット
2d70673197

+ 4 - 0
q6_felgo_iot/docs/Readme.md

@@ -1,3 +1,7 @@
+## 20260913
+    #define APP_VERSION "2.8.1"
+    1. 串口发送日志增加发送内容的打印;
+    2. 关闭相机预览的diag调试日志;
 ## 20260908
     #define APP_VERSION "2.8.0"
     1. 异步处理上传图片

+ 1 - 1
q6_felgo_iot/header/main.h

@@ -37,7 +37,7 @@
 #include <opencv2/features2d/features2d.hpp>
 #include <opencv2/xfeatures2d/nonfree.hpp>
 
-#define APP_VERSION "2.8.0"
+#define APP_VERSION "2.8.1"
 
 using namespace std;
 

+ 4 - 1
q6_felgo_iot/src/cameramanager.cpp

@@ -964,6 +964,7 @@ Frames::processFrameAsync(const RawFrame& frame){
         diagCvtUs += cvtUs;
         diagMapUs += mapUs;
         diagCopyUs += copyUs;
+#if 0
         if (diagProcN >= 30) {
             LOG("[diag] proc: avg cvt={}us avg map={}us avg copy={}us", diagCvtUs/diagProcN, diagMapUs/diagProcN, diagCopyUs/diagProcN);
             diagProcN = 0;
@@ -971,7 +972,7 @@ Frames::processFrameAsync(const RawFrame& frame){
             diagMapUs = 0;
             diagCopyUs = 0;
         }
-
+#endif
         // ✅ 投递回 UI 线程(节流:UI线程未消费完上一帧时丢弃本帧,避免事件队列积压导致内存暴涨)
         if (m_displayPending.testAndSetRelaxed(0, 1)) {
             QMetaObject::invokeMethod(m_videoSink, [this, vf]() {
@@ -1062,6 +1063,7 @@ Frames::handleGrab(bool sta_cam){
                 processFrameAsync(frame);
                 // ----- FPS -----
                 m_fps_timer->incrementFrame();
+#if 0
                 // [diag] 节流统计:每30帧打印一次平均耗时
                 diagGrabN++;
                 diagGrabWaitUs += waitUs;
@@ -1075,6 +1077,7 @@ Frames::handleGrab(bool sta_cam){
                     diagGrabWaitUs = 0;
                     diagGrabCopyUs = 0;
                 }
+#endif
 #if 1
                 if (param::camera_tc == -1) {
                     emit stopGrabbing(false);

+ 2 - 2
q6_felgo_iot/src/mserial.cpp

@@ -124,8 +124,8 @@ void SerialThread::stop()
 
 void SerialThread::sendData(const QByteArray &data)
 {
-emit netMessage(data);
-    LOG("sendData(size={})", data.size());
+    emit netMessage(data);
+    LOG("sendData( [{}] size={})",data.constData(), data.size());
     if (data.startsWith("movx") || data.startsWith("movz")) {
         timeout_mov->start(10000);
     }