From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CAligner.cpp | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CAligner.cpp b/SourceCode/Bond/Servo/CAligner.cpp
index 815b1ee..e15bfe0 100644
--- a/SourceCode/Bond/Servo/CAligner.cpp
+++ b/SourceCode/Bond/Servo/CAligner.cpp
@@ -32,7 +32,7 @@
void CAligner::initPins()
{
// 加入Pin初始化代码
- LOGI("<CAligner>initPins");
+ LOGD("<CAligner>initPins");
addPin(SERVO::PinType::INPUT, _T("In1"));
addPin(SERVO::PinType::INPUT, _T("In2"));
addPin(SERVO::PinType::OUTPUT, _T("Out1"));
@@ -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)
--
Gitblit v1.9.3