From 2f0684bf01209b9ddfdc53da44fb85f4db6db326 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 06 六月 2025 15:56:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CBakeCooling.cpp | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBakeCooling.cpp b/SourceCode/Bond/Servo/CBakeCooling.cpp
index 7d91de0..cf4caf4 100644
--- a/SourceCode/Bond/Servo/CBakeCooling.cpp
+++ b/SourceCode/Bond/Servo/CBakeCooling.cpp
@@ -44,7 +44,19 @@
m_slot[0].enable();
m_slot[0].setPosition(m_nID);
m_slot[0].setNo(1);
- m_slot[0].setName("Slot 1");
+ m_slot[0].setName("Bake 1");
+ m_slot[1].enable();
+ m_slot[1].setPosition(m_nID);
+ m_slot[1].setNo(2);
+ m_slot[1].setName("Bake 2");
+ m_slot[2].enable();
+ m_slot[2].setPosition(m_nID);
+ m_slot[2].setNo(3);
+ m_slot[2].setName("Cooling 1");
+ m_slot[3].enable();
+ m_slot[3].setPosition(m_nID);
+ m_slot[3].setNo(4);
+ m_slot[3].setName("Cooling 2");
}
void CBakeCooling::onTimer(UINT nTimerid)
@@ -65,16 +77,6 @@
int CBakeCooling::recvIntent(CPin* pPin, CIntent* pIntent)
{
return __super::recvIntent(pPin, pIntent);
- }
-
- BOOL CBakeCooling::glassWillArrive(CGlass* pGlass)
- {
- BOOL bRet = __super::glassWillArrive(pGlass);
- if (!bRet) {
- return FALSE;
- }
-
- return (m_glassList.size() < 4);
}
int CBakeCooling::getIndexerOperationModeBaseValue()
--
Gitblit v1.9.3