From 3e0ceaf4e569ea1f57a14de2f6135d1f1a50d080 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 27 八月 2025 13:47:31 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CBakeCooling.cpp | 66 ++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBakeCooling.cpp b/SourceCode/Bond/Servo/CBakeCooling.cpp
index 5387d13..26f70b6 100644
--- a/SourceCode/Bond/Servo/CBakeCooling.cpp
+++ b/SourceCode/Bond/Servo/CBakeCooling.cpp
@@ -188,12 +188,13 @@
// master recipe list report
CEqReadStep* pStep = new CEqReadStep(0x12955, 255 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ CEqReadStep* pTmpStep = (CEqReadStep*)pFrom;
+ short ret = MRLRC_OK;
if (code == ROK && pszData != nullptr && size > 0) {
// 此处解释配方数据
- short ret = decodeRecipeListReport(pszData, size);
- pStep->setReturnCode(ret);
+ ret = decodeRecipeListReport(pszData, size);
}
- pStep->setReturnCode(MRLRC_OK);
+ pTmpStep->setReturnCode(ret);
return -1;
});
pStep->setName(STEP_EQ_MASTER_RECIPE_LIST);
@@ -239,7 +240,7 @@
{
// Received Job Report Upstream #1~9
char szBuffer[256];
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < 4; i++) {
CEqReadStep* pStep = new CEqReadStep(0x10c90 + 320 * i, 320 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
@@ -263,13 +264,13 @@
{
// Sent Out Job Report Downstream #1~9
char szBuffer[256];
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < 4; i++) {
CEqReadStep* pStep = new CEqReadStep(0x10000 + 320 * i, 320 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
int port = (int)(__int64)((CEqReadStep*)pFrom)->getProp("Port");
if (port > 0) {
- decodeReceivedJobReport((CStep*)pFrom, port, pszData, size);
+ decodeSentOutJobReport((CStep*)pFrom, port, pszData, size);
}
}
return -1;
@@ -287,7 +288,7 @@
{
// Fetched Out Job Report #1~15
char szBuffer[256];
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < 4; i++) {
CEqReadStep* pStep = new CEqReadStep(0x11c31 + 18 * i, 18 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
@@ -311,7 +312,7 @@
{
// Stored Job Report #1~15
char szBuffer[256];
- for (int i = 0; i < 1; i++) {
+ for (int i = 0; i < 4; i++) {
CEqReadStep* pStep = new CEqReadStep(0x11b23 + 18 * i, 18 * 2,
[&](void* pFrom, int code, const char* pszData, size_t size) -> int {
if (code == ROK && pszData != nullptr && size > 0) {
@@ -331,6 +332,38 @@
}
}
}
+
+ // process start/end report
+ {
+ CEqReadStep* pStep = new CEqReadStep(0x11D3F, 13 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodeJobProcessStartReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_JOB_PROCESS_START_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x933);
+ if (addStep(STEP_ID_JOB_PROCESS_START_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadStep* pStep = new CEqReadStep(0x11D4C, 13 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodeJobProcessEndReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_JOB_PROCESS_END_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x934);
+ if (addStep(STEP_ID_JOB_PROCESS_END_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
}
// 必须要实现的虚函数，在此初始化Slot信息
@@ -344,18 +377,18 @@
m_slot[1].enable();
m_slot[1].setPosition(m_nID);
m_slot[1].setNo(2);
- m_slot[1].setName("Bake 2");
- m_slot[1].setLinkSignalPath(0);
+ m_slot[1].setName("Cooling 1");
+ m_slot[1].setLinkSignalPath(1);
m_slot[2].enable();
m_slot[2].setPosition(m_nID);
m_slot[2].setNo(3);
- m_slot[2].setName("Cooling 1");
- m_slot[2].setLinkSignalPath(1);
+ m_slot[2].setName("Bake 2");
+ m_slot[2].setLinkSignalPath(2);
m_slot[3].enable();
m_slot[3].setPosition(m_nID);
m_slot[3].setNo(4);
m_slot[3].setName("Cooling 2");
- m_slot[3].setLinkSignalPath(1);
+ m_slot[3].setLinkSignalPath(3);
}
void CBakeCooling::onTimer(UINT nTimerid)
@@ -382,4 +415,11 @@
{
return 25000;
}
+
+ bool CBakeCooling::isSlotProcessed(int slot)
+ {
+ CGlass* pGlass = getGlassFromSlot(slot);
+ if (pGlass == nullptr) return false;
+ return pGlass->isProcessed(m_nID, getSlotUnit(slot));
+ }
}
--
Gitblit v1.9.3