wangfq/vd_test_fixture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: FarStay 2B→1B 匹配设备实际固件

Browse Source 
协议: 0x4B LEN=0x16, 0x4C LEN=0x1A
代码: build_4b FarStay 1B, parse_4c FarStay payload[24]
前端: FarStay max=255
This commit is contained in:
wangfq
2026-06-03 11:52:42 +08:00
parent eadeed5e0f
commit 3d7aec4cad
6 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docs/DG430串口协议.md
View File

@@ -353,9 +353,9 @@ eg: 7F 81 08 4A 00 03 03 00 03 04 00 C4 E0, 表示硬件版本号3
  上位机发送格式：
| 7Fh | 80h+ADD | 17h | 4Bh | Addr | DevType | TestMode | ResetDis | MinusDis | SensMin | SensMax | FreMin | FreMax | PeakMin | PeakMax | FarTol | NearTol | StepTol | BackForth | NearStay | FarStay | XOR | SUM |
| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
| 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 2B | 2B | 2B | 2B | 2B | 2B | 1B | 1B | 1B | 1B | 2B | 2B | 1B | 1B |
| 7Fh | 80h+ADD | 16h | 4Bh | Addr | DevType | TestMode | ResetDis | MinusDis | SensMin | SensMax | FreMin | FreMax | PeakMin | PeakMax | FarTol | NearTol | StepTol | BackForth | NearStay | FarStay | XOR | SUM |
| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
| 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 2B | 2B | 2B | 2B | 2B | 2B | 1B | 1B | 1B | 1B | 2B | 1B | 1B | 1B |
说明：该指令为上位机发送给DG430。DG430接收到该指令后返回协议并更新测试参数。
@@ -385,13 +385,13 @@ BackForth：1Byte, 来回次数，金属板从最远距离→最近距离→最
NearStay：2Byte, 最近停留时间，到达波动最近距离后停留的时间，单位ms（小端模式）
FarStay：2Byte, 最远停留时间，到达波动最远距离后停留的时间，单位ms（小端模式）
FarStay：1Byte, 最远停留时间，到达波动最远距离后停留的时间，单位ms（范围 0-255）
测试用例：7F 81 19 4B 01 01 01 30 0D 00 8B 00 E6 07 76 06 D6 09 B0 0C 1C 03 02 00 05 C8 00 F4 01 2B 9F
测试用例：7F 81 18 4B 01 01 01 30 0D 00 8B 00 E6 07 76 06 D6 09 B0 0C 1C 03 02 00 05 C8 00 90 FB E8
用例说明：
Addr：0x01， DevType：0x01， TestMode：1（波动测试）， ResetDis：48cm， MinusDis：13cm， SensMin：139， SensMax：230， Fre_Min：1910， FreMax：1750， PeakMin：2480， PeakMax：3100， FarTol：3cm， NearTol：2cm， StepTol：0cm， BackForth：5次， NearStay：200ms， FarStay：500ms。
Addr：0x01， DevType：0x01， TestMode：1（波动测试）， ResetDis：48cm， MinusDis：13cm， SensMin：139， SensMax：230， Fre_Min：1910， FreMax：1750， PeakMin：2480， PeakMax：3100， FarTol：3cm， NearTol：2cm， StepTol：0cm， BackForth：5次， NearStay：200ms， FarStay：144ms。
返回格式：
@@ -418,9 +418,9 @@ Addr：0x01， DevType：0x01， TestMode：1（波动测试）， ResetDis：48
测试用例：7F 81 01 4C CC CE
| 7Fh | 80h+ADD | 1Bh | 4Ch | Flag | Addr | DevType | TestMode | ResetDis | MinusDis | SensMin | SensMax | FreMin | FreMax | PeakMin | PeakMax | FarTol | NearTol | StepTol | BackForth | NearStay | FarStay | XOR | SUM |
| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
| 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 2B | 2B | 2B | 2B | 2B | 2B | 1B | 1B | 1B | 1B | 2B | 2B | 1B | 1B |
| 7Fh | 80h+ADD | 1Ah | 4Ch | Flag | Addr | DevType | TestMode | ResetDis | MinusDis | SensMin | SensMax | FreMin | FreMax | PeakMin | PeakMax | FarTol | NearTol | StepTol | BackForth | NearStay | FarStay | XOR | SUM |
| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
| 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 1B | 2B | 2B | 2B | 2B | 2B | 2B | 1B | 1B | 1B | 1B | 2B | 1B | 1B | 1B |
 Flag：是否故障标志，00=正常，01=故障
@@ -450,9 +450,9 @@ BackForth：来回次数
NearStay：最近停留时间，单位ms（小端模式）
FarStay：最远停留时间，单位ms（小端模式）
FarStay：最远停留时间，单位ms（范围 0-255）
测试用例：7F 81 1B 4C 00 01 01 01 30 0D 00 8B 00 E6 07 76 06 D6 09 B0 0C 1C 03 02 00 05 C8 00 F4 01 8A 5E
测试用例：7F 81 1A 4C 00 01 01 01 30 0D 00 8B 00 E6 07 76 06 D6 09 B0 0C 1C 03 02 00 05 C8 00 90 10 7A
## 5.11 出厂初始化指令，命令：0x4D

BIN
edc-web/app/__pycache__/__init__.cpython-311.pyc
View File

Binary file not shown.

BIN
edc-web/app/__pycache__/models.cpython-311.pyc
View File

Binary file not shown.

7
edc-web/app/routes/fixture.py
View File

@@ -65,12 +65,12 @@ def build_4b_packet(addr: int, dev_type: int, test_mode: int,
near_stay: int = 0, far_stay: int = 0) -> str:
"""构造 0x4B 配置指令 hex 字符串 (V2.0.3 扩展)
格式: 7F | 81 | 17 | 4B | Addr(1) | DevType(1) | TestMode(1) |
格式: 7F | 81 | 16 | 4B | Addr(1) | DevType(1) | TestMode(1) |
ResetDis(1) | MinusDis(1) |
SensMin(2 LE) | SensMax(2 LE) | FreMin(2 LE) | FreMax(2 LE) |
PeakMin(2 LE) | PeakMax(2 LE) |
FarTol(1) | NearTol(1) | StepTol(1) | BackForth(1) |
NearStay(2 LE) | FarStay(2 LE) | XOR | SUM
NearStay(2 LE) | FarStay(1) | XOR | SUM
"""
payload = bytes([
0x4B, # CMD
@@ -90,7 +90,8 @@ def build_4b_packet(addr: int, dev_type: int, test_mode: int,
step_tol & 0xFF,
back_forth & 0xFF,
])
payload += _le16(near_stay) + _le16(far_stay)
payload += _le16(near_stay)
payload += bytes([far_stay & 0xFF]) # FarStay 1 字节
pkt = bytes([0x7F, 0x81, len(payload)]) + payload
xor, total = _xor_sum(pkt[1:])

2
edc-web/app/templates/fixture.html
View File

@@ -92,7 +92,7 @@
</div>
<div class="form-group">
<label>最远停留时间 (ms)</label>
<input type="number" id="param-far-stay" value="0" min="0" max="65535">
<input type="number" id="param-far-stay" value="0" min="0" max="255">
</div>
</div>

2
edc_server

Submodule edc_server updated: 6724af7951...7e5fe2cccd