From 91a2974fc7bce6e8bbd903992efae13709b0d186 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 20 五月 2025 09:48:17 +0800
Subject: [PATCH] 1.修改替换CEqVcrEventStep为(CEqReadStep)
---
SourceCode/Bond/Servo/CEFEM.cpp | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 1b792f1..91772f7 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -235,11 +235,29 @@
{
// VCR1 Event Report
+ /*
CEqVcrEventStep* pStep = new CEqVcrEventStep();
pStep->setName(STEP_EQ_VCR1_EVENT_REPORT);
pStep->setWriteSignalDev(0x4a);
pStep->setReturnDev(0x91e);
pStep->setVcrEventReportDev(0x5fef);
+ if (addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
+ 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);
if (addStep(STEP_ID_VCR1_EVENT_REPORT, pStep) != 0) {
delete pStep;
}
@@ -465,7 +483,6 @@
delete pStep;
}
}
-
}
int CEFEM::onStepEvent(CStep* pStep, int code)
--
Gitblit v1.9.3