From 11c615d0c9944f91d8a496898966d1c9fa06ace3 Mon Sep 17 00:00:00 2001 From: yiyi Date: Sat, 21 Feb 2026 16:34:38 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91ARM=E5=BA=94=E7=94=A8=20&=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=92=95=E8=A3=82=E5=8D=8F=E8=AE=AE=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/BeltTearing/Doc/撕裂TCP通信协议.md | 29 ++---- .../ChessboardDetector/ChessboardDetector.pro | 94 +++++++++---------- Utils | 2 +- 3 files changed, 57 insertions(+), 68 deletions(-) diff --git a/App/BeltTearing/Doc/撕裂TCP通信协议.md b/App/BeltTearing/Doc/撕裂TCP通信协议.md index e5345b8..9be1dcb 100644 --- a/App/BeltTearing/Doc/撕裂TCP通信协议.md +++ b/App/BeltTearing/Doc/撕裂TCP通信协议.md @@ -7,13 +7,13 @@ --- ### 版本历史 -| 版本 | 日期 | 修改内容 | 作者 | -|------|------------|------------------|-------| -| 1.4 | 2026-02-21 | 开启实时上报时不再发送DETECT_RESULT,避免重复输出;增加CMD汇总表格 | | -| 1.3 | 2026-02-12 | 增加实时传输检测结果功能(SET_REALTIME/REALTIME_RESULT) | | -| 1.2 | 2025-11-30 | 增加最大撕裂ID字段(maxId) | | -| 1.1 | 2025-11-16 | 修改协议长度的格式 | | -| 1.0 | 2025-11-11 | 初始版本 | | +| 版本 | 日期 | 修改内容 | +|------|------------|------------------| +| 1.4 | 2026-02-21 | 开启实时上报时不再发送DETECT_RESULT,避免重复输出;
增加CMD汇总表格 | +| 1.3 | 2026-02-12 | 增加实时传输检测结果功能(SET_REALTIME/REALTIME_RESULT) | +| 1.2 | 2025-11-30 | 增加最大撕裂ID字段(maxId) | +| 1.1 | 2025-11-16 | 修改协议长度的格式 | +| 1.0 | 2025-11-11 | 初始版本 | --- @@ -41,8 +41,8 @@ | msgType | 方向 | 说明 | 详细章节 | |---------|------|------|----------| -| `DETECT_RESULT` | 服务器 → 客户端 | 撕裂检测结果上报(历史最大值),仅发送给**未开启**实时传输的客户端 | 4.1 | -| `REALTIME_RESULT` | 服务器 → 客户端 | 实时检测结果上报(所有撕裂详细数据),仅发送给**已开启**实时传输的客户端 | 4.2 | +| `DETECT_RESULT` | 服务器 → 客户端 | 撕裂检测结果上报(历史最大值),
仅发送给**未开启**实时传输的客户端 | 4.1 | +| `REALTIME_RESULT` | 服务器 → 客户端 | 实时检测结果上报(所有撕裂详细数据),
仅发送给**已开启**实时传输的客户端 | 4.2 | | `SET_SPEED` | 客户端 → 服务器 | 设置皮带速度(mm/s) | 5.1 | | `SET_CONTROL` | 客户端 → 服务器 | 启动/停止检测 | 5.2 | | `SET_REALTIME` | 客户端 → 服务器 | 开启/关闭实时传输 | 5.3 | @@ -103,7 +103,6 @@ ### 4.1 撕裂检测结果上报 **消息类型**: `DETECT_RESULT` - **JSON格式**: ```json { @@ -138,15 +137,12 @@ "visimg": "/9j/4AAQSkZJRgABAQEAYABgAAD..." } ``` - --- ### 4.2 实时检测结果上报 - 当客户端开启实时传输功能后,服务器在每次检测完成时主动上报检测结果,包含所有撕裂的详细数据。 **消息类型**: `REALTIME_RESULT` - **JSON格式**: ```json { @@ -167,13 +163,6 @@ "length": 85, "width": 20, "depth": 5 - }, - { - "id": 10003, - "status": 1, - "length": 42, - "width": 15, - "depth": 3 } ], "visimg": "iVBORw0KGgoAAAANSUhEUgAAAAUA..." diff --git a/Module/ChessboardDetector/ChessboardDetector.pro b/Module/ChessboardDetector/ChessboardDetector.pro index 8de2a36..bcf6da6 100644 --- a/Module/ChessboardDetector/ChessboardDetector.pro +++ b/Module/ChessboardDetector/ChessboardDetector.pro @@ -1,47 +1,47 @@ -TEMPLATE = lib -CONFIG += staticlib c++11 -DEFINES += CHESSBOARDDETECTOR_LIBRARY - -# 包含路径 -INCLUDEPATH += ./Inc -INCLUDEPATH += ./_Inc -INCLUDEPATH += ../../Utils/VrCommon/Inc - -# 头文件 -HEADERS += \ - Inc/IChessboardDetector.h \ - _Inc/ChessboardDetector.h - -# 源文件 -SOURCES += \ - Src/ChessboardDetector.cpp - -# OpenCV 配置 -win32 { - # Windows 平台使用 OpenCV 3.2.0 - INCLUDEPATH += $$PWD/../../SDK/OpenCV320/include - - CONFIG(release, debug|release): { - LIBS += -L$$PWD/../../SDK/OpenCV320/x64/vc14/lib - LIBS += -lopencv_world320 - } - else:CONFIG(debug, debug|release): { - LIBS += -L$$PWD/../../SDK/OpenCV320/x64/vc14/lib - LIBS += -lopencv_world320d - } - - QMAKE_CXXFLAGS += /utf-8 - TARGET = ChessboardDetector -} - -unix { - # Unix/Linux 平台使用 OpenCV 3.2.0 ARM - INCLUDEPATH += $$PWD/../../SDK/OpenCV320/Arm/aarch64/include - LIBS += -L$$PWD/../../SDK/OpenCV320/Arm/aarch64 - LIBS += -lopencv_core -lopencv_imgproc -lopencv_calib3d -lopencv_features2d - - QMAKE_CXXFLAGS += -fPIC - target.path = /usr/lib -} - -!isEmpty(target.path): INSTALLS += target +TEMPLATE = lib +CONFIG += staticlib c++11 +DEFINES += CHESSBOARDDETECTOR_LIBRARY + +# 包含路径 +INCLUDEPATH += ./Inc +INCLUDEPATH += ./_Inc +INCLUDEPATH += ../../Utils/VrCommon/Inc + +# 头文件 +HEADERS += \ + Inc/IChessboardDetector.h \ + _Inc/ChessboardDetector.h + +# 源文件 +SOURCES += \ + Src/ChessboardDetector.cpp + +# OpenCV 配置 +win32 { + # Windows 平台使用 OpenCV 3.2.0 + INCLUDEPATH += $$PWD/../../SDK/OpenCV320/include + + CONFIG(release, debug|release): { + LIBS += -L$$PWD/../../SDK/OpenCV320/x64/vc14/lib + LIBS += -lopencv_world320 + } + else:CONFIG(debug, debug|release): { + LIBS += -L$$PWD/../../SDK/OpenCV320/x64/vc14/lib + LIBS += -lopencv_world320d + } + + QMAKE_CXXFLAGS += /utf-8 + TARGET = ChessboardDetector +} + +unix { + # Unix/Linux 平台使用 OpenCV 3.2.0 ARM + INCLUDEPATH += $$PWD/../../SDK/OpenCV320/include + LIBS += -L$$PWD/../../SDK/OpenCV320/Arm/aarch64 + LIBS += -lopencv_core -lopencv_imgproc -lopencv_calib3d -lopencv_features2d + + QMAKE_CXXFLAGS += -fPIC + target.path = /usr/lib +} + +!isEmpty(target.path): INSTALLS += target diff --git a/Utils b/Utils index ed67ff8..7071da6 160000 --- a/Utils +++ b/Utils @@ -1 +1 @@ -Subproject commit ed67ff85ff3bfdd54fb4b85899086a703853128b +Subproject commit 7071da62403ea703981ffe77fff948266b66fdf3