From 1bc4fecb9cc1641ed3ad0a2fda30766fc06fb13e Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 01 四月 2025 16:05:07 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CMaster.cpp | 429 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 374 insertions(+), 55 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 8c4f87d..fff1ab0 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -2,6 +2,17 @@
#include "Common.h"
#include "CMaster.h"
+
+#define ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(name,ws,index,psd) { \
+ CEqCassetteTransferStateStep* pStep = new CEqCassetteTransferStateStep(); \
+ pStep->setName(name); \
+ pStep->setWriteSignalDev(ws); \
+ pStep->setPortStatusDev(psd); \
+ if (pEquipment->addStep(index, pStep) != 0) { \
+ delete pStep; \
+ } \
+}
+
namespace SERVO {
CMaster* g_pMaster = NULL;
void CALLBACK MasterTimerProc(HWND hWnd, UINT nMsg, UINT nTimerid, DWORD dwTime)
@@ -14,6 +25,7 @@
CMaster::CMaster()
{
m_listener = {nullptr, nullptr, nullptr};
+ m_bDataModify = FALSE;
}
CMaster::~CMaster()
@@ -28,21 +40,12 @@
{
m_listener.onEqAlive = listener.onEqAlive;
m_listener.onEqCimStateChanged = listener.onEqCimStateChanged;
- m_listener.onEqStepEvent = listener.onEqStepEvent;
+ m_listener.onEqAlarm = listener.onEqAlarm;
}
int CMaster::init()
{
LOGI("<Master>正在初始化...");
-
-
- StepListener listener;
- listener.onEvent = [&](void* pStep, int code, void* pData) -> void {
- TRACE("<CEquipment>onEvent<%d, 0x%x>.\n", code, pData);
- if (m_listener.onEqStepEvent != nullptr) {
- m_listener.onEqStepEvent((CStep*)pStep, code, pData);
- }
- };
// cclink
@@ -72,18 +75,22 @@
// 初始化添加各子设备
- addLoadPort(0, listener);
- addLoadPort(1, listener);
- addLoadPort(2, listener);
- addLoadPort(3, listener);
- addFliper(listener);
- addVacuumBake(listener);
- addAligner(listener);
- addEFEM(listener);
- addBonder(0, listener);
- addBonder(1, listener);
- addBakeCooling(listener);
+ addLoadPort(0);
+ addLoadPort(1);
+ addLoadPort(2);
+ addLoadPort(3);
+ addFliper();
+ addVacuumBake();
+ addAligner();
+ addEFEM();
+ addBonder(0);
+ addBonder(1);
+ addBakeCooling();
connectEquipments();
+
+
+ // 读缓存数据
+ readCache();
// 定时器
@@ -101,6 +108,8 @@
for (auto item : m_listEquipment) {
item->term();
}
+ saveCache();
+
return 0;
}
@@ -120,6 +129,16 @@
m_listener.onEqCimStateChanged(this, p, bOn);
}
};
+ listener.onAlarm = [&](void* pEquipment, int state, int alarmId, int unitId, int level) -> void {
+ CEquipment* p = (CEquipment*)pEquipment;
+ if (m_listener.onEqAlarm != nullptr) {
+ m_listener.onEqAlarm(this, p, state, alarmId, unitId, level);
+ }
+ };
+ listener.onDataChanged = [&](void* pEquipment, int code) -> void {
+ m_bDataModify = TRUE;
+ };
+
pEquipment->setListener(listener);
pEquipment->setCcLink(&m_cclink);
m_listEquipment.push_back(pEquipment);
@@ -144,7 +163,7 @@
/* 添加LoadPort1
* index -- 0~3
*/
- int CMaster::addLoadPort(int index, StepListener& listener)
+ int CMaster::addLoadPort(int index)
{
ASSERT(index == 0 || index == 1 || index == 2 || index == 3);
char szName[64];
@@ -162,7 +181,7 @@
return 0;
}
- int CMaster::addFliper(StepListener& listener)
+ int CMaster::addFliper()
{
CFliper* pEquipment = new CFliper();
pEquipment->setID(EQ_ID_FLIPER);
@@ -179,7 +198,7 @@
return 0;
}
- int CMaster::addVacuumBake(StepListener& listener)
+ int CMaster::addVacuumBake()
{
CVacuumBake* pEquipment = new CVacuumBake();
pEquipment->setID(EQ_ID_VACUUMBAKE);
@@ -196,7 +215,7 @@
return 0;
}
- int CMaster::addAligner(StepListener& listener)
+ int CMaster::addAligner()
{
CAligner* pEquipment = new CAligner();
pEquipment->setID(EQ_ID_ALIGNER);
@@ -213,7 +232,7 @@
return 0;
}
- int CMaster::addEFEM(StepListener& listener)
+ int CMaster::addEFEM()
{
CEFEM* pEquipment = new CEFEM();
pEquipment->setID(EQ_ID_EFEM);
@@ -229,7 +248,6 @@
{
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x30);
pStep->setModeDev(0x4a8c);
if (pEquipment->addStep(0x360, pStep) != 0) {
@@ -239,7 +257,6 @@
{
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x31);
pStep->setStatusDev(0x4a68);
if (pEquipment->addStep(0x361, pStep) != 0) {
@@ -249,7 +266,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK1);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x32);
pStep->setAlarmDev(0x4c1d);
if (pEquipment->addStep(0x362, pStep) != 0) {
@@ -259,7 +275,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK2);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x33);
pStep->setAlarmDev(0x4c4a);
if (pEquipment->addStep(0x363, pStep) != 0) {
@@ -269,7 +284,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK3);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x34);
pStep->setAlarmDev(0x4c77);
if (pEquipment->addStep(0x364, pStep) != 0) {
@@ -279,7 +293,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK4);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x35);
pStep->setAlarmDev(0x4ca4);
if (pEquipment->addStep(0x365, pStep) != 0) {
@@ -289,7 +302,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK5);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x36);
pStep->setAlarmDev(0x4cd1);
if (pEquipment->addStep(0x366, pStep) != 0) {
@@ -299,7 +311,6 @@
{
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x37);
pStep->setProcessDev(0x5864);
if (pEquipment->addStep(0x367, pStep) != 0) {
@@ -309,7 +320,6 @@
{
CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
pStep->setName(STEP_CIM_MODE_CHANGE);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x50);
pStep->setCimModeDev(0x15);
if (pEquipment->addStep(0x350, pStep) != 0) {
@@ -319,7 +329,6 @@
{
CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
pStep->setName(STEP_CIM_MESSAGE_CMD);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x51);
pStep->setCimMessageDev(0x0);
if (pEquipment->addStep(0x351, pStep) != 0) {
@@ -329,7 +338,6 @@
{
CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
pStep->setName(STEP_CIM_MESSAGE_CLEAR);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x52);
pStep->setClearCimMessageDev(0x13);
if (pEquipment->addStep(0x352, pStep) != 0) {
@@ -339,7 +347,6 @@
{
CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
pStep->setName(STEP_DATETIME_SET_CMD);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x53);
pStep->setDateTimeDev(0x16);
if (pEquipment->addStep(0x353, pStep) != 0) {
@@ -349,7 +356,6 @@
{
CEqVCREnableStep* pStep = new CEqVCREnableStep();
pStep->setName(STEP_EQ_VCR_ENABLE);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x54);
pStep->setEqVCRModeDev(0x1F);
if (pEquipment->addStep(0x354, pStep) != 0) {
@@ -359,13 +365,263 @@
{
CEqModeChangeStep* pStep = new CEqModeChangeStep();
pStep->setName(STEP_EQ_MODE_CHANGE);
- pStep->setListener(listener);
pStep->setWriteSignalDev(0x55);
pStep->setEqModeDev(0x1E);
if (pEquipment->addStep(0x355, pStep) != 0) {
delete pStep;
}
}
+
+ // Port1
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d1f);
+ pStep->setName(STEP_EQ_PORT1_TYPE);
+ pStep->setWriteSignalDev(0x80);
+ if (pEquipment->addStep(0x3e0, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d20);
+ pStep->setName(STEP_EQ_PORT1_MODE);
+ pStep->setWriteSignalDev(0x88);
+ if (pEquipment->addStep(0x3e8, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x4d21);
+ pStep->setName(STEP_EQ_PORT1_CASSETTE_TYPE);
+ pStep->setWriteSignalDev(0x90);
+ if (pEquipment->addStep(0x3f0, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d23);
+ pStep->setName(STEP_EQ_PORT1_TRANSFER_MODE);
+ pStep->setWriteSignalDev(0x98);
+ if (pEquipment->addStep(0x3f8, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d24);
+ pStep->setName(STEP_EQ_PORT1_ENABLE);
+ pStep->setWriteSignalDev(0xa0);
+ if (pEquipment->addStep(0x400, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d25);
+ pStep->setName(STEP_EQ_PORT1_TYPE_ATUO);
+ pStep->setWriteSignalDev(0xa8);
+ if (pEquipment->addStep(0x408, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ // Port2
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d2f);
+ pStep->setName(STEP_EQ_PORT2_TYPE);
+ pStep->setWriteSignalDev(0x81);
+ if (pEquipment->addStep(0x3e1, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d30);
+ pStep->setName(STEP_EQ_PORT2_MODE);
+ pStep->setWriteSignalDev(0x89);
+ if (pEquipment->addStep(0x3e9, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x4d31);
+ pStep->setName(STEP_EQ_PORT2_CASSETTE_TYPE);
+ pStep->setWriteSignalDev(0x91);
+ if (pEquipment->addStep(0x3f1, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d33);
+ pStep->setName(STEP_EQ_PORT2_TRANSFER_MODE);
+ pStep->setWriteSignalDev(0x99);
+ if (pEquipment->addStep(0x3f9, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d34);
+ pStep->setName(STEP_EQ_PORT2_ENABLE);
+ pStep->setWriteSignalDev(0xa1);
+ if (pEquipment->addStep(0x401, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d35);
+ pStep->setName(STEP_EQ_PORT2_TYPE_ATUO);
+ pStep->setWriteSignalDev(0xa9);
+ if (pEquipment->addStep(0x409, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ // Port3
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d3f);
+ pStep->setName(STEP_EQ_PORT3_TYPE);
+ pStep->setWriteSignalDev(0x82);
+ if (pEquipment->addStep(0x3e2, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d40);
+ pStep->setName(STEP_EQ_PORT3_MODE);
+ pStep->setWriteSignalDev(0x8a);
+ if (pEquipment->addStep(0x3ea, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x4d41);
+ pStep->setName(STEP_EQ_PORT3_CASSETTE_TYPE);
+ pStep->setWriteSignalDev(0x92);
+ if (pEquipment->addStep(0x3f2, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d43);
+ pStep->setName(STEP_EQ_PORT3_TRANSFER_MODE);
+ pStep->setWriteSignalDev(0x9a);
+ if (pEquipment->addStep(0x3fa, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d44);
+ pStep->setName(STEP_EQ_PORT3_ENABLE);
+ pStep->setWriteSignalDev(0xa2);
+ if (pEquipment->addStep(0x402, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d45);
+ pStep->setName(STEP_EQ_PORT3_TYPE_ATUO);
+ pStep->setWriteSignalDev(0xaa);
+ if (pEquipment->addStep(0x40a, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ // Port4
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d4f);
+ pStep->setName(STEP_EQ_PORT4_TYPE);
+ pStep->setWriteSignalDev(0x83);
+ if (pEquipment->addStep(0x3e3, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d50);
+ pStep->setName(STEP_EQ_PORT4_MODE);
+ pStep->setWriteSignalDev(0x8b);
+ if (pEquipment->addStep(0x3eb, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x4d51);
+ pStep->setName(STEP_EQ_PORT4_CASSETTE_TYPE);
+ pStep->setWriteSignalDev(0x93);
+ if (pEquipment->addStep(0x3f3, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d53);
+ pStep->setName(STEP_EQ_PORT4_TRANSFER_MODE);
+ pStep->setWriteSignalDev(0x9b);
+ if (pEquipment->addStep(0x3fb, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d54);
+ pStep->setName(STEP_EQ_PORT4_ENABLE);
+ pStep->setWriteSignalDev(0xa3);
+ if (pEquipment->addStep(0x403, pStep) != 0) {
+ delete pStep;
+ }
+ }
+ {
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x4d55);
+ pStep->setName(STEP_EQ_PORT4_TYPE_ATUO);
+ pStep->setWriteSignalDev(0xab);
+ if (pEquipment->addStep(0x40b, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+
+ // CEqCassetteTranserStateStep
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_EMPTY, 0xb8,
+ STEP_ID_PORT1_CASSETTIE_EMPTY, 0x4d5f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOAD_EADY, 0xc0,
+ STEP_ID_PORT1_CASSETTIE_LOAD_READY, 0x4d5f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOADED, 0xc8,
+ STEP_ID_PORT1_CASSETTIE_LOADED, 0x4d5f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_INUSE, 0xd0,
+ STEP_ID_PORT1_CASSETTIE_INUSE, 0x4d5f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_UNLOAD_EADY, 0xd8,
+ STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, 0x4d5f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_BLOCKED, 0xe0,
+ STEP_ID_PORT1_CASSETTIE_BLOCKED, 0x4d5f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_EMPTY,
+ STEP_ID_PORT2_CASSETTIE_EMPTY, 0x418, 0x4d7f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOAD_EADY,
+ STEP_ID_PORT2_CASSETTIE_LOAD_READY, 0x420, 0x4d7f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOADED,
+ STEP_ID_PORT2_CASSETTIE_LOADED, 0x428, 0x4d7f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_INUSE,
+ STEP_ID_PORT2_CASSETTIE_INUSE, 0x430, 0x4d7f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_UNLOAD_EADY,
+ STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, 0x438, 0x4d7f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_BLOCKED,
+ STEP_ID_PORT2_CASSETTIE_BLOCKED, 0x440, 0x4d7f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_EMPTY,
+ STEP_ID_PORT3_CASSETTIE_EMPTY, 0x418, 0x4d9f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOAD_EADY,
+ STEP_ID_PORT3_CASSETTIE_LOAD_READY, 0x420, 0x4d9f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOADED,
+ STEP_ID_PORT3_CASSETTIE_INUSE, 0x428, 0x4d9f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_INUSE,
+ STEP_ID_PORT3_CASSETTIE_INUSE, 0x430, 0x4d9f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_UNLOAD_EADY,
+ STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, 0x438, 0x4d9f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_BLOCKED,
+ STEP_ID_PORT3_CASSETTIE_BLOCKED, 0x440, 0x4d9f);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_EMPTY,
+ STEP_ID_PORT4_CASSETTIE_EMPTY, 0x418, 0x4dbf);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOAD_EADY,
+ STEP_ID_PORT4_CASSETTIE_LOAD_READY, 0x420, 0x4dbf);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOADED,
+ STEP_ID_PORT4_CASSETTIE_LOADED, 0x428, 0x4dbf);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_INUSE,
+ STEP_ID_PORT4_CASSETTIE_INUSE, 0x430, 0x4dbf);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_UNLOAD_EADY,
+ STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, 0x438, 0x4dbf);
+ ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_BLOCKED,
+ STEP_ID_PORT4_CASSETTIE_BLOCKED, 0x440, 0x4dbf);
pEquipment->init();
LOGE("已添加“EFEM(ROBOT)”.");
@@ -376,7 +632,7 @@
* index -- 0, bonder1
* index -- 1, bonder2
*/
- int CMaster::addBonder(int index, StepListener& listener)
+ int CMaster::addBonder(int index)
{
ASSERT(index == 0 || index == 1);
CBonder* pEquipment = new CBonder();
@@ -393,7 +649,6 @@
{
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x330 : 0x630);
pStep->setModeDev(index == 0 ? 0x6a8c : 0x848c);
if (pEquipment->addStep(0x360, pStep) != 0) {
@@ -403,7 +658,6 @@
{
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x331 : 0x631);
pStep->setStatusDev(index == 0 ? 0x6a68 : 0x8a68);
if (pEquipment->addStep(0x361, pStep) != 0) {
@@ -413,7 +667,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK1);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x332 : 0x632);
pStep->setAlarmDev(index == 0 ? 0x6c1d : 0x8c1d);
if (pEquipment->addStep(0x362, pStep) != 0) {
@@ -423,7 +676,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK2);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x333 : 0x633);
pStep->setAlarmDev(index == 0 ? 0x6c4a : 0x8c4a);
if (pEquipment->addStep(0x363, pStep) != 0) {
@@ -433,7 +685,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK3);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x334 : 0x634);
pStep->setAlarmDev(index == 0 ? 0x6c77 : 0x8c77);
if (pEquipment->addStep(0x364, pStep) != 0) {
@@ -443,7 +694,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK4);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x335 : 0x635);
pStep->setAlarmDev(index == 0 ? 0x6ca4 : 0x8ca4);
if (pEquipment->addStep(0x365, pStep) != 0) {
@@ -453,7 +703,6 @@
{
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK5);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x336 : 0x636);
pStep->setAlarmDev(index == 0 ? 0x6cd1 : 0x8cd1);
if (pEquipment->addStep(0x366, pStep) != 0) {
@@ -463,7 +712,6 @@
{
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x337 : 0x637);
pStep->setProcessDev(index == 0 ? 0x7864 : 0x9864);
if (pEquipment->addStep(0x367, pStep) != 0) {
@@ -473,7 +721,6 @@
{
CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
pStep->setName(STEP_CIM_MODE_CHANGE);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x350 : 0x650);
pStep->setCimModeDev(index == 0 ? 0x965 : 0x12b5);
if (pEquipment->addStep(0x350, pStep) != 0) {
@@ -483,7 +730,6 @@
{
CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
pStep->setName(STEP_CIM_MESSAGE_CMD);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x351 : 0x651);
pStep->setCimMessageDev(index == 0 ? 0x950 : 0x12a0);
if (pEquipment->addStep(0x351, pStep) != 0) {
@@ -493,7 +739,6 @@
{
CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
pStep->setName(STEP_CIM_MESSAGE_CLEAR);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x352 : 0x652);
pStep->setClearCimMessageDev(index == 0 ? 0x963 : 0x12b3);
if (pEquipment->addStep(0x352, pStep) != 0) {
@@ -503,7 +748,6 @@
{
CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
pStep->setName(STEP_DATETIME_SET_CMD);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x353 : 0x653);
pStep->setDateTimeDev(index == 0 ? 0x966 : 0x12b6);
if (pEquipment->addStep(0x353, pStep) != 0) {
@@ -513,7 +757,6 @@
{
CEqModeChangeStep* pStep = new CEqModeChangeStep();
pStep->setName(STEP_EQ_MODE_CHANGE);
- pStep->setListener(listener);
pStep->setWriteSignalDev(index == 0 ? 0x355 : 0x655);
pStep->setEqModeDev(index == 0 ? 0x96E : 0x12be);
if (pEquipment->addStep(0x355, pStep) != 0) {
@@ -529,7 +772,7 @@
return 0;
}
- int CMaster::addBakeCooling(StepListener& listener)
+ int CMaster::addBakeCooling()
{
CBakeCooling* pEquipment = new CBakeCooling();
pEquipment->setID(EQ_ID_BAKE_COOLING);
@@ -569,6 +812,16 @@
}
}
}
+
+
+ // 自动保存缓存
+ if (i % (4 * 2) == 0) {
+ if (m_bDataModify) {
+ saveCacheAndBackups();
+ m_bDataModify = FALSE;
+ }
+ }
+
}
void CMaster::connectEquipments()
@@ -643,4 +896,70 @@
LOGE("连接BakeCooling-LoadPort4失败");
}
}
+
+ int CMaster::saveCache()
+ {
+ CFile file;
+ if (!file.Open(m_strFilepath.c_str(), CFile::modeCreate | CFile::modeWrite)) {
+ return -1;
+ }
+
+ CArchive ar(&file, CArchive::store);
+ serialize(ar);
+ ar.Close();
+ file.Close();
+
+ return 0;
+ }
+
+ int CMaster::saveCacheAndBackups()
+ {
+ saveCache();
+
+
+ // 创建备份目录
+ CString strNewFile;
+ CString strFileDir = m_strFilepath.c_str();
+ int index = strFileDir.ReverseFind('\\');
+ ASSERT(index > 0);
+ strFileDir = strFileDir.Left(index);
+ strFileDir = strFileDir + _T("Backups");
+ ::CreateDirectory(strFileDir, nullptr);
+
+ CTime time = CTime::GetCurrentTime();
+ strNewFile.Format(_T("%s//Master_%d_%02d_%02d_%02d_%02d_%02d.dat"),
+ (LPTSTR)(LPCTSTR)strFileDir,
+ time.GetYear(), time.GetMonth(), time.GetDay(),
+ time.GetHour(), time.GetMinute(), time.GetSecond());
+ ::CopyFile(m_strFilepath.c_str(), strNewFile, FALSE);
+
+ return 0;
+ }
+
+ void CMaster::setCacheFilepath(const char* pszFilepath)
+ {
+ m_strFilepath = pszFilepath;
+ }
+
+ int CMaster::readCache()
+ {
+ CFile file;
+ if (!file.Open(m_strFilepath.c_str(), CFile::modeRead)) {
+ return -1;
+ }
+
+ CArchive ar(&file, CArchive::load);
+ serialize(ar);
+ ar.Close();
+ file.Close();
+
+ return 0;
+ }
+
+ void CMaster::serialize(CArchive& ar)
+ {
+ for (auto item : m_listEquipment) {
+ item->serialize(ar);
+ }
+ }
}
--
Gitblit v1.9.3