From 91aa55602d295902f593972dd2065422b4b93557 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 25 四月 2025 08:54:18 +0800
Subject: [PATCH] 1.map地址有修改，重新整理，待测试。
---
SourceCode/Bond/Servo/CEquipment.cpp | 89 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 4d23681..86a2bf2 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -311,7 +311,7 @@
// 以下解释和处理数据
BOOL bFlag;
- int index = 0x340;
+ int index = 0x840;
// alive
@@ -370,62 +370,63 @@
// 以下根据信号做流程处理
-
- // Equipment Mode Change Report(0x360)
- // Equipment Status Change Report(0x361)
- // Equipment Alarm Change Report(0x362 ~ 0x366)
for (int i = 0; i < 7; i++) {
- CHECK_READ_STEP_SIGNAL(0x360 + i, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_EQMODE_CHANGED + i, pszData, size);
}
// CIM Mode
- CHECK_WRITE_STEP_SIGNAL(0x350, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pszData, size);
- // CIM Message Set
- CHECK_WRITE_STEP_SIGNAL(0x351, pszData, size);
+ // CIM Message Set cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIM_MSG_SET_CMD_REPLY, pszData, size);
- // CIM Message Clear
- CHECK_WRITE_STEP_SIGNAL(0x352, pszData, size);
+ // CIM Message Clear cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIM_MSG_CLEAR_CMD_REPLY, pszData, size);
+
+ // Datetime set cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_DATETIME_SET_CMD_REPLY, pszData, size);
+
+ // vcr enable cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_VCR_ENABLE_CMD_REPLY, pszData, size);
+
+ // EQ mode change cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pszData, size);
// CIM Message Confirm
- CHECK_READ_STEP_SIGNAL(0x369, pszData, size);
-
-
- // EQ Mode
- CHECK_WRITE_STEP_SIGNAL(0x355, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_CIM_MSG_CONFIRM_REPORT, pszData, size);
// EQ Job Event
- CHECK_READ_STEP_SIGNAL(0x380, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x381, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x386, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x387, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS1, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS2, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS1, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS2, pszData, size);
// Port1 ~ Port4
- CHECK_READ_STEP_SIGNAL(0x3e0, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e1, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e2, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e3, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e8, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3e9, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3ea, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3eb, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f0, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f1, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f2, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f3, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f8, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3f9, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3fa, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x3fb, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x400, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x401, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x402, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x403, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x408, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x409, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x40a, pszData, size);
- CHECK_READ_STEP_SIGNAL(0x40b, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_CASSETTE_TYPE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TRANSFER_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TRANSFER_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TRANSFER_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TRANSFER_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_ENABLE_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_ENABLE_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_ENABLE_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_ENABLE_MODE_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_TYPE_AUTO_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_TYPE_AUTO_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_TYPE_AUTO_CHANGE, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_TYPE_AUTO_CHANGE, pszData, size);
// CEqCassetteTranserStateStep
CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_CASSETTIE_EMPTY, pszData, size);
--
Gitblit v1.9.3