From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CFliper.cpp | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/CFliper.cpp b/SourceCode/Bond/Servo/CFliper.cpp
index acd7654..d0f5f9c 100644
--- a/SourceCode/Bond/Servo/CFliper.cpp
+++ b/SourceCode/Bond/Servo/CFliper.cpp
@@ -32,10 +32,20 @@
void CFliper::initPins()
{
// 加入Pin初始化代码
- LOGI("<CFliper>initPins");
- addPin(SERVO::PinType::INPUT, _T("In1"));
- addPin(SERVO::PinType::INPUT, _T("In2"));
- addPin(SERVO::PinType::OUTPUT, _T("Out"));
+ LOGD("<CFliper>initPins");
+ addPin(SERVO::PinType::INPUT, _T("In"));
+ addPin(SERVO::PinType::OUTPUT, _T("Out1"));
+ addPin(SERVO::PinType::OUTPUT, _T("Out2"));
+ }
+
+ // 必须要实现的虚函数，在此初始化Slot信息
+ void CFliper::initSlots()
+ {
+ m_slot[0].enable();
+ m_slot[0].setPosition(m_nID);
+ m_slot[0].setNo(1);
+ m_slot[0].setName("Slot 1(G2)");
+ m_slot[0].setType(MaterialsType::G2);
}
void CFliper::onTimer(UINT nTimerid)
@@ -56,15 +66,5 @@
int CFliper::recvIntent(CPin* pPin, CIntent* pIntent)
{
return __super::recvIntent(pPin, pIntent);
- }
-
- BOOL CFliper::glassWillArrive(CGlass* pGlass)
- {
- BOOL bRet = __super::glassWillArrive(pGlass);
- if (!bRet) {
- return FALSE;
- }
-
- return m_glassList.empty();
}
}
--
Gitblit v1.9.3