From a45b4d054b38a7ae0c80cf55c05adcc193ff1e64 Mon Sep 17 00:00:00 2001 From: txp <771454616@qq.com> Date: Tue, 17 Nov 2026 17:43:45 +0800 Subject: [PATCH] Add multi-device protocol analysis and template-linked plots --- .github/workflows/ci.yml | 59 ++ CHANGELOG.md | 20 + CMakeLists.txt | 31 +- README.md | 18 +- README_EN.md | 20 +- docs/ai-control.md | 15 +- docs/images/protocol-analysis-en-dark.png | Bin 0 -> 137105 bytes docs/images/protocol-analysis-en-light.png | Bin 0 -> 137423 bytes docs/images/protocol-analysis-zh-dark.png | Bin 0 -> 147423 bytes docs/images/protocol-analysis-zh-light.png | Bin 0 -> 147335 bytes docs/images/protocol-editor-en-dark.png | Bin 254294 -> 123301 bytes docs/images/protocol-editor-en-light.png | Bin 252361 -> 118076 bytes docs/images/protocol-editor-zh-dark.png | Bin 259351 -> 131180 bytes docs/images/protocol-editor-zh-light.png | Bin 257312 -> 127160 bytes docs/release-notes/v0.1.29.md | 19 + src/app/core/macos_accessibility_fix.h | 12 + src/app/core/macos_accessibility_fix.mm | 112 +++ src/app/core/plot_value_parser.cpp | 12 +- src/app/core/plot_value_parser.h | 3 + src/app/core/protocol_template.cpp | 166 +++- src/app/core/protocol_template.h | 19 + .../i18n/fluentserialassistant.en_US.qm | Bin 81082 -> 89407 bytes .../i18n/fluentserialassistant.en_US.ts | 262 ++++++ .../i18n/fluentserialassistant.zh_CN.qm | Bin 57653 -> 63382 bytes .../i18n/fluentserialassistant.zh_CN.ts | 262 ++++++ src/app/view/plot_parser_dialog.cpp | 123 ++- src/app/view/plot_parser_dialog.h | 8 + src/app/view/protocol_analysis_window.cpp | 470 +++++++++ src/app/view/protocol_analysis_window.h | 82 ++ src/app/view/protocol_payload_editor.cpp | 301 ++++++ src/app/view/protocol_payload_editor.h | 52 + src/app/view/protocol_template_window.cpp | 890 +++++++++++++----- src/app/view/protocol_template_window.h | 39 +- src/app/view/quick_plot_window.cpp | 75 +- src/app/view/quick_plot_window.h | 16 +- .../view/workbench/workbench_page_plot.cpp | 41 +- .../workbench_page_protocol_templates.cpp | 101 +- .../workbench_page_side_sections.cpp | 61 +- .../view/workbench/workbench_page_state.cpp | 11 + .../workbench/workbench_page_terminal.cpp | 9 +- src/app/view/workbench_page.h | 10 +- src/main.cpp | 2 + tests/tst_macos_accessibility.mm | 93 ++ tests/tst_protocol_analysis.cpp | 521 ++++++++++ tests/tst_protocol_windows.cpp | 127 ++- tests/tst_virtual_serial_workbench.cpp | 36 + tests/tst_workbench_quick_plot.cpp | 118 ++- third_party/FluentQtWidgets | 2 +- 48 files changed, 3789 insertions(+), 429 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 docs/images/protocol-analysis-en-dark.png create mode 100644 docs/images/protocol-analysis-en-light.png create mode 100644 docs/images/protocol-analysis-zh-dark.png create mode 100644 docs/images/protocol-analysis-zh-light.png create mode 100644 docs/release-notes/v0.1.29.md create mode 100644 src/app/core/macos_accessibility_fix.h create mode 100644 src/app/core/macos_accessibility_fix.mm create mode 100644 src/app/view/protocol_analysis_window.cpp create mode 100644 src/app/view/protocol_analysis_window.h create mode 100644 src/app/view/protocol_payload_editor.cpp create mode 100644 src/app/view/protocol_payload_editor.h create mode 100644 tests/tst_macos_accessibility.mm create mode 100644 tests/tst_protocol_analysis.cpp diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..d20a9fd --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,59 @@ +name: CI + +on: + push: + branches: [main] + pull_request: + +permissions: + contents: read + +concurrency: + group: ci-${{ github.ref }} + cancel-in-progress: true + +env: + QT_VERSION: "6.12.0" + AQT_SOURCE: "git+https://github.com/miurahr/aqtinstall.git" + +jobs: + build-and-test: + name: Build and test (${{ matrix.os }}) + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-24.04, windows-2022, macos-15] + steps: + - name: Check out sources and submodules + uses: actions/checkout@v6 + with: + submodules: recursive + + - name: Install Linux dependencies + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt-get install -y ninja-build libgl1-mesa-dev libxcb-cursor0 libxkbcommon-x11-0 + + - name: Install Qt + uses: jurplel/install-qt-action@v4 + with: + version: ${{ env.QT_VERSION }} + aqtsource: ${{ env.AQT_SOURCE }} + modules: "qt5compat qtserialport" + cache: true + + - name: Configure Windows + if: runner.os == 'Windows' + run: cmake -S . -B build/ci -G "Visual Studio 17 2022" -A x64 -DBUILD_TESTING=ON + + - name: Configure macOS and Linux + if: runner.os != 'Windows' + run: cmake -S . -B build/ci -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON + + - name: Build + run: cmake --build build/ci --config Release --parallel 2 + + - name: Test + run: ctest --test-dir build/ci -C Release --output-on-failure --no-tests=error diff --git a/CHANGELOG.md b/CHANGELOG.md index f0b3f00..212c43e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ 本项目遵循面向用户的变更记录格式。版本号在正式发布前可能继续调整。 +## [0.1.29] - 2026-11-17 + +### 新增 + +- 协议模板可定义载荷字段的类型、字节序、倍率、加值和设备地址;新增实时解析窗口,按模板、地址、字段查看数值,勾选即可比较多个设备的曲线,对应 [#20](https://github.com/txp666/FluentSerialAssistant/issues/20)。 +- 协议编辑器与曲线窗口共用模板字段和解析规则;“创建曲线”带入当前模板与样例,保存同名模板后同步关联曲线并清空旧数据。 + +### 改进 + +- 协议编辑器始终显示字节图和右侧模板设置,字段列表用对应颜色展示字节与解析值,支持拖动数据字段调整顺序;解析窗口可收起左侧配置区。 +- 按字段类型和协议配置自动生成匹配样例并重算长度、校验。手动粘贴或“最新接收”的样例在编辑配置时保留,清空后继续编辑可恢复自动生成。 +- 协议解析与曲线共用断帧逻辑,支持分批接收和连续多帧;已断帧的数据块可跳过长度越界的残缺候选。 + +### 修复 + +- 串口断开、重新连接时丢弃未收齐的半帧,避免不同连接的数据拼接;已采集的曲线保留。 +- 保存其他模板时不再覆盖当前曲线使用的模板草稿。 +- 修复 Qt 6.12.0 下数值输入框在窄布局后恢复宽度仍不显示数值,以及 macOS 辅助功能访问动态表格时可能崩溃的问题。 +- 更新 FluentQtWidgets,补齐表格排序箭头资源。 + ## [0.1.28] - 2026-11-15 ### 新增 diff --git a/CMakeLists.txt b/CMakeLists.txt index ad0ebce..e18ec28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,11 +2,17 @@ cmake_minimum_required(VERSION 3.21) project( FluentSerialAssistant - VERSION 0.1.28 + VERSION 0.1.29 DESCRIPTION "A Fluent Qt serial assistant prototype" LANGUAGES CXX ) +if(APPLE) + enable_language(OBJCXX) + set(CMAKE_OBJCXX_STANDARD 17) + set(CMAKE_OBJCXX_STANDARD_REQUIRED ON) +endif() + include(GNUInstallDirs) set(CMAKE_CXX_STANDARD 17) @@ -131,6 +137,10 @@ add_executable(FluentSerialAssistant src/app/view/plot_parser_dialog.h src/app/view/protocol_template_window.cpp src/app/view/protocol_template_window.h + src/app/view/protocol_payload_editor.cpp + src/app/view/protocol_payload_editor.h + src/app/view/protocol_analysis_window.cpp + src/app/view/protocol_analysis_window.h src/app/view/quick_plot_window.cpp src/app/view/quick_plot_window.h src/app/view/settings_page.cpp @@ -200,6 +210,12 @@ target_link_libraries(FluentSerialAssistant FluentSerialPlotParser ) +if(APPLE AND Qt6_VERSION VERSION_EQUAL "6.12.0") + target_sources(FluentSerialAssistant PRIVATE src/app/core/macos_accessibility_fix.mm) + set_source_files_properties(src/app/core/macos_accessibility_fix.mm PROPERTIES COMPILE_OPTIONS "-fno-objc-arc") + target_link_libraries(FluentSerialAssistant PRIVATE "-framework AppKit") +endif() + if(WIN32) target_link_libraries(FluentSerialAssistant PRIVATE shell32) endif() @@ -219,7 +235,7 @@ if(BUILD_TESTING) ) get_target_property(workbench_test_libraries FluentSerialAssistant LINK_LIBRARIES) target_link_libraries(FluentSerialTestSupport PUBLIC ${workbench_test_libraries}) - foreach(test_name IN ITEMS data_table_model frame_codecs plot_value_parser control_service workbench_data_table workbench_quick_plot workbench_reliability protocol_windows terminal_view terminal_colors + foreach(test_name IN ITEMS data_table_model frame_codecs plot_value_parser control_service workbench_data_table workbench_quick_plot workbench_reliability protocol_windows protocol_analysis terminal_view terminal_colors auto_reply virtual_serial_pair virtual_serial_workbench update_downloader update_installer update_ui update_manager main_window) add_executable(tst_${test_name} tests/tst_${test_name}.cpp) @@ -227,6 +243,17 @@ if(BUILD_TESTING) add_test(NAME ${test_name} COMMAND tst_${test_name}) set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=offscreen" TIMEOUT 120) endforeach() + if(APPLE AND Qt6_VERSION VERSION_EQUAL "6.12.0") + add_executable(tst_macos_accessibility + tests/tst_macos_accessibility.mm + src/app/core/macos_accessibility_fix.mm + ) + target_include_directories(tst_macos_accessibility PRIVATE src) + target_compile_options(tst_macos_accessibility PRIVATE -fno-objc-arc) + target_link_libraries(tst_macos_accessibility PRIVATE Qt6::Widgets Qt6::Test "-framework AppKit") + add_test(NAME macos_accessibility COMMAND tst_macos_accessibility) + set_tests_properties(macos_accessibility PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=cocoa" TIMEOUT 120) + endif() endif() add_executable(fluentserial-cli diff --git a/README.md b/README.md index fdb359e..0a6e9eb 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,9 @@ Fluent 串口助手提供现代 Fluent 风格的串口终端,覆盖连接、

帧协议编辑器:字节结构、字段和校验一目了然

数据表格:按帧查看 HEX、文本和校验结果

协议解析:按地址查看三个设备的实时字段,并在同一张图上比较曲线

Frame protocol editor showing byte layout, fields, and checksum

Frame table with HEX, text, and checksum results

Protocol analysis: live fields from three device addresses and their curves on one chart
1+
zF< 4
zIDyCc9Nu|(={tcpPV^ -qK)0L2V&q9_>_J5D=Qu)2CR-%cLXh?ECH9l!8G}%B51W@dVKF`VEE$k~q$y8Xu
zRh7K+Qh`#+X&afba}>s@2NGrvwAi>&5yD;(n!87O)aj);1rO?&M}4BAw3m5;JlF03
z!@z+p|Dm5(!r#5!dYLT$wfnW|1inw9x39PcwU8e#InGZ*6v}Sfb~sH-F5(qb6cT44
zn#pIrD$elaSuB9#N9Q8l 2ec
z=PiFd(#-Yxe@wk~SXJBi#=AgD8YHAQ0!pKVG}5U^Nry;xgOqfLpn!x(NQabC(xMao6a_;>Gk0w|e$)!j
z?a`YZ_Eh~cF}bU(udICJ@9^AnQ}%OlPX8YYdU|6WomGlbWizus39N?GsB%f7Y2H5q
zd#SPvCs;7BgaIC$W&;f@0
%b3E|-2yb*2)deX{T7)Slsg@lS~eRUPW*9jyDh=M04CxCeezJGta
z+G~asjW79qHiV}i;(O4cV*40pZQ=fnhy0ICl}^;tN73KsI_yRh5pFvjJTYzBz?-ye
zx1_q--|Zogy0zb9Yu9$+Nw)oGk?*E_50cx&-*oU!+Se}^LxxHdwfXLeOu6b2EiU@J
z`1`Z(wNx=Ds>_+NE-2qOmY32Z=JPMQmJSwW8t=u5P2l7W(;))AA>Cq6KO{>5*fBUZXFxMLhz7Y9aU
&CuRdHI01ynTymor^H9&d*FKnGEXh5E(7FW;k5@pX2RsY^=!$*N
z^8LF$qyx;g5C7dhnp{D|?}^V1-8!QcukDiW4IU)Fkdg|F1)&~zQRo4^ev@+!v^~Jt
zaI@VI)
piZbqq`3S9t1&DJ7H2nSYZEtfcK+S
zUV9+QJAC*ZWcC8u*dvbj-@Si-eq&;8P61XAsrj$(9-bH<&ptz0-2_~C=gyq~b)Vu!
z%bggBPH5HT<=1W~|NV{DD4ND>Tek{ErDFeH#EOpsE>K+Ny0ewk{JS_BBrPos`iO}j
zJ3`Z7p4dK9()Iz@AB4dXFqiQuw9L$z(r!tE^hWmQ&UGO5m$Fwvis%kI
zJI|kc{C)FXmX9a-lie&OvO`0nRol89xLeo*{J8NpBg63G{{0j^#`@Q0w#!_UOd@YX
z^-?LhoKiVi)x(}gP_^7p9UI%edt$4&(x}v--I0_dfwfzF~vDJNa-3yjXccn
zQO~bTsWA!NQq
Zk!GN)i^ph@7AK%67w3HnD8jj^_Qa9KM~{S)97!iED9F%v-`F8*
z;9rUq6SFSio8>=WJ=0$n|MfEq?AL+wN}v%9k48}^a4S(g2F;bWB2m?aW#Y*@M|Z0x
zh1CKe1ey;jFw!stW~IfpJ&+ZAnfv4YLzVQ3QK}|nW^Oi6Fe`vSfio%-&c&mDf6Agz
z!C?kmyi_
l2y_qg7@=y(xSzB0L)3Jj&uYW0nrZ?
zf!~GjZK${cz~=UG!MQJAjD>s=+t%0CcrhUJ$rICWLeN7F)CE8u4$2XwYQgkr^;v#J
z#dN!5tkmP|K5)_j8tAS2f+&IUGcq{R;6Th$fwz`wDwU3PCA+#PzQ
zHjsOQaB}ys_de*UK}Lf%Nv7F^{{+Y~sdh>dDSFwn!y&P{_HY=nHZv;_hK&f&Om0rj
zeeqfs-hBXSM;6A1kVZuyXM{b<1Wu`oV+~|b%7dgy5fU1zrTG%0N%LLuMvwmU58K5B
zP_#y|*>JI#ZDC`>OF$2I8IKNVpw$yK{2Y$7O|W9YK{VB0Oh`-XNG}+?Ssc(G(Ibze
zXntxc&tws>N8?xC7uM%n%Nu@+x+pNHMG%BW_)WUFVjM^ra5N}nvzQut(Hgdsx}#^i
zUBFsdJEQ(
vB02M`_3U8s*@P}9
z%Y-HW>2bULk~4MX|M+$Xe*Cq5S%kI;Y?9}z(>n-ca%H<)#m>GJo7y5{+Ykc9rPC3a
zT*o6_G2-iW61C6o-Fxw9Dt*&{D?P$lN==W)!MwAo|L
U