diff --git a/docs/DG430串口协议.md b/docs/DG430串口协议.md index d37f169..4db89f0 100644 --- a/docs/DG430串口协议.md +++ b/docs/DG430串口协议.md @@ -353,9 +353,9 @@ eg: 7F 81 08 4A 00 03 03 00 03 04 00 C4 E0, 表示硬件版本号3   上位机发送格式： -| 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 | +| 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 | 说明：该指令为上位机发送给DG430。DG430接收到该指令后返回协议并更新测试参数。 @@ -385,13 +385,13 @@ BackForth：1Byte, 来回次数，金属板从最远距离→最近距离→最 NearStay：2Byte, 最近停留时间，到达波动最近距离后停留的时间，单位ms（小端模式） -FarStay：1Byte, 最远停留时间，到达波动最远距离后停留的时间，单位ms（范围 0-255） +FarStay：2Byte, 最远停留时间，到达波动最远距离后停留的时间，单位ms（小端模式） -测试用例：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 +测试用例：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 用例说明： -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。 +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。 返回格式： @@ -418,9 +418,9 @@ Addr：0x01， DevType：0x01， TestMode：1（波动测试）， ResetDis：48 测试用例：7F 81 01 4C CC CE -| 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 | +| 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 |  Flag：是否故障标志，00=正常，01=故障 @@ -450,9 +450,9 @@ BackForth：来回次数 NearStay：最近停留时间，单位ms（小端模式） -FarStay：最远停留时间，单位ms（范围 0-255） +FarStay：最远停留时间，单位ms（小端模式） -测试用例：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 +测试用例：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 ## 5.11 出厂初始化指令，命令：0x4D diff --git a/edc-web/app/routes/.fixture.py.swp b/edc-web/app/routes/.fixture.py.swp new file mode 100644 index 0000000..58453b7 Binary files /dev/null and b/edc-web/app/routes/.fixture.py.swp differ diff --git a/edc-web/app/routes/fixture.py b/edc-web/app/routes/fixture.py index 95a15ba..f63c1a5 100644 --- a/edc-web/app/routes/fixture.py +++ b/edc-web/app/routes/fixture.py @@ -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 | 16 | 4B | Addr(1) | DevType(1) | TestMode(1) | + 格式: 7F | 81 | 17 | 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(1) | XOR | SUM + NearStay(2 LE) | FarStay(2 LE) | XOR | SUM """ payload = bytes([ 0x4B, # CMD @@ -90,8 +90,7 @@ def build_4b_packet(addr: int, dev_type: int, test_mode: int, step_tol & 0xFF, back_forth & 0xFF, ]) - payload += _le16(near_stay) - payload += bytes([far_stay & 0xFF]) # FarStay 1 字节 + payload += _le16(near_stay) + _le16(far_stay) pkt = bytes([0x7F, 0x81, len(payload)]) + payload xor, total = _xor_sum(pkt[1:]) diff --git a/edc-web/app/templates/fixture.html b/edc-web/app/templates/fixture.html index 8961bb3..208aa80 100644 --- a/edc-web/app/templates/fixture.html +++ b/edc-web/app/templates/fixture.html @@ -92,7 +92,7 @@
- +
diff --git a/edc_server b/edc_server index 7e5fe2c..dc1d2b8 160000 --- a/edc_server +++ b/edc_server @@ -1 +1 @@ -Subproject commit 7e5fe2cccda10f02a167852e7fef4099a69a0fc0 +Subproject commit dc1d2b8871be634f542dd3ce44b049340bac1604