From ebc5dba7e2b0dccb9583faefa21ffd3454792788 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 20 五月 2025 14:32:43 +0800
Subject: [PATCH] 1.修改名称，ID等；
---
SourceCode/Bond/Servo/CEquipment.cpp | 48 ++++----
SourceCode/Bond/Servo/CEFEM.cpp | 117 +++++++++-------------
SourceCode/Bond/Servo/CEFEM.h | 1
SourceCode/Bond/Servo/Common.h | 96 +++++++++---------
4 files changed, 121 insertions(+), 141 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 91772f7..82ab452 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -3,7 +3,7 @@
#include "Log.h"
-#define ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(name,ws,index,psd) { \
+#define ADD_EQ_PORT_STATUS_STEP(name,ws,index,psd) { \
CEqCassetteTransferStateStep* pStep = new CEqCassetteTransferStateStep(); \
pStep->setName(name); \
pStep->setWriteSignalDev(ws); \
@@ -330,54 +330,54 @@
}
// CEqCassetteTranserStateStep
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_EMPTY, 0xd8,
- STEP_ID_PORT1_CASSETTIE_EMPTY, 0x6050);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOAD_EADY, 0xe0,
- STEP_ID_PORT1_CASSETTIE_LOAD_READY, 0x6050);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOADED, 0xe8,
- STEP_ID_PORT1_CASSETTIE_LOADED, 0x6050);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_INUSE, 0xf0,
- STEP_ID_PORT1_CASSETTIE_INUSE, 0x6050);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_UNLOAD_EADY, 0xf8,
- STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, 0x60f50);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_BLOCKED, 0x100,
- STEP_ID_PORT1_CASSETTIE_BLOCKED, 0x6050);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_EMPTY, 0xd9,
- STEP_ID_PORT2_CASSETTIE_EMPTY, 0x6070);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOAD_EADY, 0xe1,
- STEP_ID_PORT2_CASSETTIE_LOAD_READY, 0x6070);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOADED, 0xe9,
- STEP_ID_PORT2_CASSETTIE_LOADED, 0x6070);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_INUSE, 0xf1,
- STEP_ID_PORT2_CASSETTIE_INUSE, 0x6070);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_UNLOAD_EADY, 0xf9,
- STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, 0x6070);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_BLOCKED, 0x101,
- STEP_ID_PORT2_CASSETTIE_BLOCKED, 0x6070);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_EMPTY, 0xda,
- STEP_ID_PORT3_CASSETTIE_EMPTY, 0x6090);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOAD_EADY, 0xe2,
- STEP_ID_PORT3_CASSETTIE_LOAD_READY, 0x6090);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOADED, 0xea,
- STEP_ID_PORT3_CASSETTIE_INUSE, 0x6090);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_INUSE, 0xf2,
- STEP_ID_PORT3_CASSETTIE_INUSE, 0x6090);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_UNLOAD_EADY, 0xfa,
- STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, 0x6090);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_BLOCKED, 0x102,
- STEP_ID_PORT3_CASSETTIE_BLOCKED, 0x6090);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_EMPTY, 0xdb,
- STEP_ID_PORT4_CASSETTIE_EMPTY, 0x60b0);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOAD_EADY, 0xe3,
- STEP_ID_PORT4_CASSETTIE_LOAD_READY, 0x60b0);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOADED, 0xeb,
- STEP_ID_PORT4_CASSETTIE_LOADED, 0x60b0);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_INUSE, 0xf3,
- STEP_ID_PORT4_CASSETTIE_INUSE, 0x60b0);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_UNLOAD_EADY, 0xfb,
- STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, 0x60b0);
- ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_BLOCKED, 0x103,
- STEP_ID_PORT4_CASSETTIE_BLOCKED, 0x60b0);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT1_EMPTY, 0xd8,
+ STEP_ID_PORT1_EMPTY, 0x6050);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT1_LOAD_EADY, 0xe0,
+ STEP_ID_PORT1_LOAD_READY, 0x6050);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT1_LOADED, 0xe8,
+ STEP_ID_PORT1_LOADED, 0x6050);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT1_INUSE, 0xf0,
+ STEP_ID_PORT1_INUSE, 0x6050);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT1_UNLOAD_EADY, 0xf8,
+ STEP_ID_PORT1_UNLOAD_READY, 0x60f50);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT1_BLOCKED, 0x100,
+ STEP_ID_PORT1_BLOCKED, 0x6050);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT2_EMPTY, 0xd9,
+ STEP_ID_PORT2_EMPTY, 0x6070);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT2_LOAD_EADY, 0xe1,
+ STEP_ID_PORT2_LOAD_READY, 0x6070);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT2_LOADED, 0xe9,
+ STEP_ID_PORT2_LOADED, 0x6070);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT2_INUSE, 0xf1,
+ STEP_ID_PORT2_INUSE, 0x6070);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT2_UNLOAD_EADY, 0xf9,
+ STEP_ID_PORT2_UNLOAD_READY, 0x6070);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT2_BLOCKED, 0x101,
+ STEP_ID_PORT2_BLOCKED, 0x6070);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT3_EMPTY, 0xda,
+ STEP_ID_PORT3_EMPTY, 0x6090);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT3_LOAD_EADY, 0xe2,
+ STEP_ID_PORT3_LOAD_READY, 0x6090);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT3_LOADED, 0xea,
+ STEP_ID_PORT3_INUSE, 0x6090);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT3_INUSE, 0xf2,
+ STEP_ID_PORT3_INUSE, 0x6090);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT3_UNLOAD_EADY, 0xfa,
+ STEP_ID_PORT3_UNLOAD_READY, 0x6090);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT3_BLOCKED, 0x102,
+ STEP_ID_PORT3_BLOCKED, 0x6090);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT4_EMPTY, 0xdb,
+ STEP_ID_PORT4_EMPTY, 0x60b0);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT4_LOAD_EADY, 0xe3,
+ STEP_ID_PORT4_LOAD_READY, 0x60b0);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT4_LOADED, 0xeb,
+ STEP_ID_PORT4_LOADED, 0x60b0);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT4_INUSE, 0xf3,
+ STEP_ID_PORT4_INUSE, 0x60b0);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT4_UNLOAD_EADY, 0xfb,
+ STEP_ID_PORT4_UNLOAD_READY, 0x60b0);
+ ADD_EQ_PORT_STATUS_STEP(STEP_EQ_PORT4_BLOCKED, 0x103,
+ STEP_ID_PORT4_BLOCKED, 0x60b0);
{
// Received Job Report Upstream#1~9
@@ -483,25 +483,6 @@
delete pStep;
}
}
- }
-
- int CEFEM::onStepEvent(CStep* pStep, int code)
- {
- int nRet = CEquipment::onStepEvent(pStep, code);
- if (nRet > 0) return nRet;
-
- if (code == STEP_EVENT_READDATA) {
- if (isCassetteTransferStateStep(pStep)) {
- SERVO::CEqCassetteTransferStateStep* pEqCassetteStep = (SERVO::CEqCassetteTransferStateStep*)pStep;
- int id = pEqCassetteStep->getID();
- if (id == STEP_ID_PORT1_CASSETTIE_EMPTY) {
-
- }
- }
- }
-
-
- return 0;
}
void CEFEM::onTimer(UINT nTimerid)
diff --git a/SourceCode/Bond/Servo/CEFEM.h b/SourceCode/Bond/Servo/CEFEM.h
index fc1c739..c038fbe 100644
--- a/SourceCode/Bond/Servo/CEFEM.h
+++ b/SourceCode/Bond/Servo/CEFEM.h
@@ -20,7 +20,6 @@
virtual void term();
virtual void initPins();
virtual void initSteps();
- virtual int onStepEvent(CStep* pStep, int code);
virtual void onTimer(UINT nTimerid);
virtual void serialize(CArchive& ar);
virtual void getAttributeVector(CAttributeVector& attrubutes);
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index ad9ab25..e4d8c07 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -493,30 +493,30 @@
// CEqCassetteTranserStateStep
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOAD_READY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_LOADED, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_INUSE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_BLOCKED, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_EMPTY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOAD_READY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_LOADED, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_INUSE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTIE_BLOCKED, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_EMPTY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOAD_READY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_LOADED, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_INUSE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTIE_BLOCKED, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_EMPTY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOAD_READY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_LOADED, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_INUSE, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, pszData, size);
- CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTIE_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_BLOCKED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_EMPTY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_LOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_LOADED, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_INUSE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_UNLOAD_READY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_BLOCKED, pszData, size);
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h
index 34549ac..aa287e8 100644
--- a/SourceCode/Bond/Servo/Common.h
+++ b/SourceCode/Bond/Servo/Common.h
@@ -111,30 +111,30 @@
#define STEP_EQ_PORT4_TRANSFER_MODE _T("EQPort4TransferMode")
#define STEP_EQ_PORT4_ENABLE _T("EQPort4Enable")
#define STEP_EQ_PORT4_TYPE_ATUO _T("EQPort4TypeAuto")
-#define STEP_EQ_P1_CASSETTE_EMPTY _T("EQPort1CassetteEmpty")
-#define STEP_EQ_P1_CASSETTE_LOAD_EADY _T("EQPort1CassetteLoadReady")
-#define STEP_EQ_P1_CASSETTE_LOADED _T("EQPort1CassetteLoaded")
-#define STEP_EQ_P1_CASSETTE_INUSE _T("EQPort1CassetteInUse")
-#define STEP_EQ_P1_CASSETTE_UNLOAD_EADY _T("EQPort1CassetteUnloadReady")
-#define STEP_EQ_P1_CASSETTE_BLOCKED _T("EQPort1CassetteBlocked")
-#define STEP_EQ_P2_CASSETTE_EMPTY _T("EQPort2CassetteEmpty")
-#define STEP_EQ_P2_CASSETTE_LOAD_EADY _T("EQPort2CassetteLoadReady")
-#define STEP_EQ_P2_CASSETTE_LOADED _T("EQPort2CassetteLoaded")
-#define STEP_EQ_P2_CASSETTE_INUSE _T("EQPort2CassetteInUse")
-#define STEP_EQ_P2_CASSETTE_UNLOAD_EADY _T("EQPort2CassetteUnloadReady")
-#define STEP_EQ_P2_CASSETTE_BLOCKED _T("EQPort2CassetteBlocked")
-#define STEP_EQ_P3_CASSETTE_EMPTY _T("EQPort3CassetteEmpty")
-#define STEP_EQ_P3_CASSETTE_LOAD_EADY _T("EQPort3CassetteLoadReady")
-#define STEP_EQ_P3_CASSETTE_LOADED _T("EQPort3CassetteLoaded")
-#define STEP_EQ_P3_CASSETTE_INUSE _T("EQPort3CassetteInUse")
-#define STEP_EQ_P3_CASSETTE_UNLOAD_EADY _T("EQPort3CassetteUnloadReady")
-#define STEP_EQ_P3_CASSETTE_BLOCKED _T("EQPort3CassetteBlocked")
-#define STEP_EQ_P4_CASSETTE_EMPTY _T("EQPort4CassetteEmpty")
-#define STEP_EQ_P4_CASSETTE_LOAD_EADY _T("EQPort4CassetteLoadReady")
-#define STEP_EQ_P4_CASSETTE_LOADED _T("EQPort4CassetteLoaded")
-#define STEP_EQ_P4_CASSETTE_INUSE _T("EQPort4CassetteInUse")
-#define STEP_EQ_P4_CASSETTE_UNLOAD_EADY _T("EQPort4CassetteUnloadReady")
-#define STEP_EQ_P4_CASSETTE_BLOCKED _T("EQPort4CassetteBlocked")
+#define STEP_EQ_PORT1_EMPTY _T("EQPort1Empty")
+#define STEP_EQ_PORT1_LOAD_EADY _T("EQPort1LoadReady")
+#define STEP_EQ_PORT1_LOADED _T("EQPort1Loaded")
+#define STEP_EQ_PORT1_INUSE _T("EQPort1InUse")
+#define STEP_EQ_PORT1_UNLOAD_EADY _T("EQPort1UnloadReady")
+#define STEP_EQ_PORT1_BLOCKED _T("EQPort1Blocked")
+#define STEP_EQ_PORT2_EMPTY _T("EQPort2Empty")
+#define STEP_EQ_PORT2_LOAD_EADY _T("EQPort2LoadReady")
+#define STEP_EQ_PORT2_LOADED _T("EQPort2Loaded")
+#define STEP_EQ_PORT2_INUSE _T("EQPort2InUse")
+#define STEP_EQ_PORT2_UNLOAD_EADY _T("EQPort2UnloadReady")
+#define STEP_EQ_PORT2_BLOCKED _T("EQPort2Blocked")
+#define STEP_EQ_PORT3_EMPTY _T("EQPort3Empty")
+#define STEP_EQ_PORT3_LOAD_EADY _T("EQPort3LoadReady")
+#define STEP_EQ_PORT3_LOADED _T("EQPort3Loaded")
+#define STEP_EQ_PORT3_INUSE _T("EQPort3InUse")
+#define STEP_EQ_PORT3_UNLOAD_EADY _T("EQPort3UnloadReady")
+#define STEP_EQ_PORT3_BLOCKED _T("EQPort3Blocked")
+#define STEP_EQ_PORT4_EMPTY _T("EQPort4Empty")
+#define STEP_EQ_PORT4_LOAD_EADY _T("EQPort4LoadReady")
+#define STEP_EQ_PORT4_LOADED _T("EQPort4Loaded")
+#define STEP_EQ_PORT4_INUSE _T("EQPort4InUse")
+#define STEP_EQ_PORT4_UNLOAD_EADY _T("EQPort4UnloadReady")
+#define STEP_EQ_PORT4_BLOCKED _T("EQPort4Blocked")
#define STEP_EQ_P1_CASSETTE_CTRL_CMD _T("EQPort1CassetteCtrlCmd")
#define STEP_EQ_P2_CASSETTE_CTRL_CMD _T("EQPort2CassetteCtrlCmd")
#define STEP_EQ_P3_CASSETTE_CTRL_CMD _T("EQPort3CassetteCtrlCmd")
@@ -310,30 +310,30 @@
#define STEP_ID_PORT2_TYPE_AUTO_CHANGE 0x629
#define STEP_ID_PORT3_TYPE_AUTO_CHANGE 0x62A
#define STEP_ID_PORT4_TYPE_AUTO_CHANGE 0x62B
-#define STEP_ID_PORT1_CASSETTIE_EMPTY 0x638
-#define STEP_ID_PORT1_CASSETTIE_LOAD_READY 0x640
-#define STEP_ID_PORT1_CASSETTIE_LOADED 0x648
-#define STEP_ID_PORT1_CASSETTIE_INUSE 0x650
-#define STEP_ID_PORT1_CASSETTIE_UNLOAD_READY 0x658
-#define STEP_ID_PORT1_CASSETTIE_BLOCKED 0x660
-#define STEP_ID_PORT2_CASSETTIE_EMPTY 0x639
-#define STEP_ID_PORT2_CASSETTIE_LOAD_READY 0x641
-#define STEP_ID_PORT2_CASSETTIE_LOADED 0x649
-#define STEP_ID_PORT2_CASSETTIE_INUSE 0x651
-#define STEP_ID_PORT2_CASSETTIE_UNLOAD_READY 0x659
-#define STEP_ID_PORT2_CASSETTIE_BLOCKED 0x661
-#define STEP_ID_PORT3_CASSETTIE_EMPTY 0x63a
-#define STEP_ID_PORT3_CASSETTIE_LOAD_READY 0x642
-#define STEP_ID_PORT3_CASSETTIE_LOADED 0x64a
-#define STEP_ID_PORT3_CASSETTIE_INUSE 0x652
-#define STEP_ID_PORT3_CASSETTIE_UNLOAD_READY 0x65a
-#define STEP_ID_PORT3_CASSETTIE_BLOCKED 0x662
-#define STEP_ID_PORT4_CASSETTIE_EMPTY 0x63b
-#define STEP_ID_PORT4_CASSETTIE_LOAD_READY 0x643
-#define STEP_ID_PORT4_CASSETTIE_LOADED 0x64b
-#define STEP_ID_PORT4_CASSETTIE_INUSE 0x653
-#define STEP_ID_PORT4_CASSETTIE_UNLOAD_READY 0x65b
-#define STEP_ID_PORT4_CASSETTIE_BLOCKED 0x663
+#define STEP_ID_PORT1_EMPTY 0x638
+#define STEP_ID_PORT1_LOAD_READY 0x640
+#define STEP_ID_PORT1_LOADED 0x648
+#define STEP_ID_PORT1_INUSE 0x650
+#define STEP_ID_PORT1_UNLOAD_READY 0x658
+#define STEP_ID_PORT1_BLOCKED 0x660
+#define STEP_ID_PORT2_EMPTY 0x639
+#define STEP_ID_PORT2_LOAD_READY 0x641
+#define STEP_ID_PORT2_LOADED 0x649
+#define STEP_ID_PORT2_INUSE 0x651
+#define STEP_ID_PORT2_UNLOAD_READY 0x659
+#define STEP_ID_PORT2_BLOCKED 0x661
+#define STEP_ID_PORT3_EMPTY 0x63a
+#define STEP_ID_PORT3_LOAD_READY 0x642
+#define STEP_ID_PORT3_LOADED 0x64a
+#define STEP_ID_PORT3_INUSE 0x652
+#define STEP_ID_PORT3_UNLOAD_READY 0x65a
+#define STEP_ID_PORT3_BLOCKED 0x662
+#define STEP_ID_PORT4_EMPTY 0x63b
+#define STEP_ID_PORT4_LOAD_READY 0x643
+#define STEP_ID_PORT4_LOADED 0x64b
+#define STEP_ID_PORT4_INUSE 0x653
+#define STEP_ID_PORT4_UNLOAD_READY 0x65b
+#define STEP_ID_PORT4_BLOCKED 0x663
#define STEP_ID_ROBOT_CMD_REPLY 0x6b0
--
Gitblit v1.9.3