From da96e6da0b677c6a4e96308aaecd3d619a8e4db2 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 26 六月 2025 08:46:11 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CArm.cpp | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CArm.cpp b/SourceCode/Bond/Servo/CArm.cpp
index e698692..7ca9be1 100644
--- a/SourceCode/Bond/Servo/CArm.cpp
+++ b/SourceCode/Bond/Servo/CArm.cpp
@@ -34,6 +34,15 @@
}
+ // 必须要实现的虚函数，在此初始化Slot信息
+ void CArm::initSlots()
+ {
+ m_slot[0].enable();
+ m_slot[0].setPosition(m_nID);
+ m_slot[0].setNo(1);
+ m_slot[0].setName("Slot 1(Temp)");
+ }
+
void CArm::onTimer(UINT nTimerid)
{
CEquipment::onTimer(nTimerid);
@@ -56,13 +65,15 @@
int CArm::tempStore(CGlass* pGlass)
{
- // 保证列表中只存储一个物料
+ // 原：保证列表中只存储一个物料
+ // 修改为：先清空之前的，再添加当前pGlass
Lock();
- for (auto item : m_glassList) {
- item->release();
+ CGlass* pPreviousGlass;
+ pPreviousGlass = (CGlass*)m_slot[0].getContext();
+ if (pPreviousGlass != nullptr) {
+ pPreviousGlass->release();
}
- m_glassList.clear();
- addGlassToList(pGlass);
+ m_slot[0].setContext(pGlass);
Unlock();
if (m_listener.onDataChanged != nullptr) {
@@ -75,17 +86,14 @@
int CArm::tempFetchOut(OUT CGlass*& pGlass)
{
Lock();
- if (m_glassList.empty()) {
+ CGlass* pPreviousGlass = (CGlass*)m_slot[0].getContext();
+ if (pPreviousGlass == nullptr) {
Unlock();
return -1;
}
-
- pGlass = m_glassList.front();
+ pGlass = pPreviousGlass;
pGlass->addRef();
- for (auto item : m_glassList) {
- item->release();
- }
- m_glassList.clear();
+ m_slot[0].setContext(nullptr);
Unlock();
if (m_listener.onDataChanged != nullptr) {
--
Gitblit v1.9.3