From ee4945bb0e32a065ce1d5d23ec6afbcba4bbcc03 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 09 九月 2025 09:33:49 +0800
Subject: [PATCH] 1.VCR转移到Aligner
---
SourceCode/Bond/Servo/CAligner.cpp | 19 +++++++++++++++++++
SourceCode/Bond/Servo/CEFEM.cpp | 19 -------------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/SourceCode/Bond/Servo/CAligner.cpp b/SourceCode/Bond/Servo/CAligner.cpp
index 815b1ee..b48d48d 100644
--- a/SourceCode/Bond/Servo/CAligner.cpp
+++ b/SourceCode/Bond/Servo/CAligner.cpp
@@ -68,6 +68,25 @@
delete pStep;
}
}
+
+ // VCR Event Report
+ // 机器上报扫码结果，扫码器预计安装在巡边检机器上
+ {
+ CEqReadStep* pStep = new CEqReadStep(0x5fef, 15 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodeVCREventReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x4a);
+ pStep->setReturnDev(0x91e);
+ if (addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
}
void CAligner::onReceiveLBData(const char* pszData, size_t size)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index fae20a5..7715750 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -461,25 +461,6 @@
}
{
- // VCR Event Report
- // 机器上报扫码结果，扫码器预计安装在巡边检机器上
- CEqReadStep* pStep = new CEqReadStep(0x5fef, 15 * 2,
- [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
- if (code == ROK && pszData != nullptr && size > 0) {
- decodeVCREventReport((CStep*)pFrom, pszData, size);
- }
- return -1;
- });
- pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
- pStep->setProp("Port", (void*)1);
- pStep->setWriteSignalDev(0x4a);
- pStep->setReturnDev(0x91e);
- if (addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
- delete pStep;
- }
- }
-
- {
// eq cim message clear
CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
pStep->setName(STEP_CIM_MESSAGE_CLEAR);
--
Gitblit v1.9.3