From e1b3a1f5e35b09be95d694bc259b0ba92c4d3436 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 26 四月 2025 10:55:23 +0800
Subject: [PATCH] 1.再一次修改地址；
---
SourceCode/Bond/Servo/CMaster.cpp | 144 ++++++++++++++++++++++++------------------------
1 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index ac55915..9d7a38d 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -327,7 +327,7 @@
pEquipment->setBaseAlarmId(BASE_ALARM_EFEM);
pEquipment->setName("EFEM(ROBOT)");
pEquipment->setDescription("EFEM(ROBOT).");
- pEquipment->setReadBitBlock(0x4000, 0x4aff);
+ pEquipment->setReadBitBlock(0x3000, 0x3aff);
pEquipment->setStation(0, 255);
addToEquipmentList(pEquipment);
@@ -337,7 +337,7 @@
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
pStep->setWriteSignalDev(0x50);
- pStep->setModeDev(0x6c7d);
+ pStep->setModeDev(0x5d7d);
if (pEquipment->addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
delete pStep;
}
@@ -346,7 +346,7 @@
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
pStep->setWriteSignalDev(0x51);
- pStep->setStatusDev(0x6c59);
+ pStep->setStatusDev(0x5d59);
if (pEquipment->addStep(STEP_ID_EQSTATUS_CHANGED, pStep) != 0) {
delete pStep;
}
@@ -355,7 +355,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK1);
pStep->setWriteSignalDev(0x52);
- pStep->setAlarmDev(0x6e0e);
+ pStep->setAlarmDev(0x5f0e);
if (pEquipment->addStep(STEP_ID_EQALARM1, pStep) != 0) {
delete pStep;
}
@@ -364,7 +364,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK2);
pStep->setWriteSignalDev(0x53);
- pStep->setAlarmDev(0x6e3b);
+ pStep->setAlarmDev(0x5f3b);
if (pEquipment->addStep(STEP_ID_EQALARM2, pStep) != 0) {
delete pStep;
}
@@ -373,7 +373,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK3);
pStep->setWriteSignalDev(0x54);
- pStep->setAlarmDev(0x6e68);
+ pStep->setAlarmDev(0x5f68);
if (pEquipment->addStep(STEP_ID_EQALARM3, pStep) != 0) {
delete pStep;
}
@@ -382,7 +382,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK4);
pStep->setWriteSignalDev(0x55);
- pStep->setAlarmDev(0x6e95);
+ pStep->setAlarmDev(0x5f95);
if (pEquipment->addStep(STEP_ID_EQALARM4, pStep) != 0) {
delete pStep;
}
@@ -391,7 +391,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK5);
pStep->setWriteSignalDev(0x56);
- pStep->setAlarmDev(0x6ec2);
+ pStep->setAlarmDev(0x5fc2);
if (pEquipment->addStep(STEP_ID_EQALARM5, pStep) != 0) {
delete pStep;
}
@@ -400,7 +400,7 @@
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
pStep->setWriteSignalDev(0x57);
- pStep->setProcessDev(0x7a55);
+ pStep->setProcessDev(0x6b55);
if (pEquipment->addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
delete pStep;
}
@@ -425,7 +425,7 @@
}
{
// CIM Message Confirm
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6c80);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x5f80);
pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
pStep->setWriteSignalDev(0x59);
if (pEquipment->addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
@@ -471,7 +471,7 @@
// Port1
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f10);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6010);
pStep->setName(STEP_EQ_PORT1_TYPE);
pStep->setWriteSignalDev(0xa0);
if (pEquipment->addStep(STEP_ID_PORT1_TYPE_CHANGE, pStep) != 0) {
@@ -479,7 +479,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f11);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6011);
pStep->setName(STEP_EQ_PORT1_MODE);
pStep->setWriteSignalDev(0xa8);
if (pEquipment->addStep(STEP_ID_PORT1_MODE_CHANGE, pStep) != 0) {
@@ -487,7 +487,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6f12);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6012);
pStep->setName(STEP_EQ_PORT1_CASSETTE_TYPE);
pStep->setWriteSignalDev(0xb0);
if (pEquipment->addStep(STEP_ID_PORT1_CASSETTE_TYPE_CHANGE, pStep) != 0) {
@@ -495,7 +495,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f14);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6014);
pStep->setName(STEP_EQ_PORT1_TRANSFER_MODE);
pStep->setWriteSignalDev(0xb8);
if (pEquipment->addStep(STEP_ID_PORT1_TRANSFER_MODE_CHANGE, pStep) != 0) {
@@ -503,7 +503,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f15);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6015);
pStep->setName(STEP_EQ_PORT1_ENABLE);
pStep->setWriteSignalDev(0xc0);
if (pEquipment->addStep(STEP_ID_PORT1_ENABLE_MODE_CHANGE, pStep) != 0) {
@@ -511,7 +511,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f16);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6016);
pStep->setName(STEP_EQ_PORT1_TYPE_ATUO);
pStep->setWriteSignalDev(0xc8);
if (pEquipment->addStep(STEP_ID_PORT1_TYPE_AUTO_CHANGE, pStep) != 0) {
@@ -521,7 +521,7 @@
// Port2
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f20);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6020);
pStep->setName(STEP_EQ_PORT2_TYPE);
pStep->setWriteSignalDev(0xa1);
if (pEquipment->addStep(STEP_ID_PORT2_TYPE_CHANGE, pStep) != 0) {
@@ -529,7 +529,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f21);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6021);
pStep->setName(STEP_EQ_PORT2_MODE);
pStep->setWriteSignalDev(0xa9);
if (pEquipment->addStep(STEP_ID_PORT2_MODE_CHANGE, pStep) != 0) {
@@ -537,7 +537,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6f22);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6022);
pStep->setName(STEP_EQ_PORT2_CASSETTE_TYPE);
pStep->setWriteSignalDev(0xb1);
if (pEquipment->addStep(STEP_ID_PORT2_CASSETTE_TYPE_CHANGE, pStep) != 0) {
@@ -545,7 +545,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f24);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6024);
pStep->setName(STEP_EQ_PORT2_TRANSFER_MODE);
pStep->setWriteSignalDev(0xb9);
if (pEquipment->addStep(STEP_ID_PORT2_TRANSFER_MODE_CHANGE, pStep) != 0) {
@@ -553,7 +553,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f25);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6025);
pStep->setName(STEP_EQ_PORT2_ENABLE);
pStep->setWriteSignalDev(0xc1);
if (pEquipment->addStep(STEP_ID_PORT2_ENABLE_MODE_CHANGE, pStep) != 0) {
@@ -561,7 +561,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f26);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6026);
pStep->setName(STEP_EQ_PORT2_TYPE_ATUO);
pStep->setWriteSignalDev(0xc9);
if (pEquipment->addStep(STEP_ID_PORT2_TYPE_AUTO_CHANGE, pStep) != 0) {
@@ -571,7 +571,7 @@
// Port3
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f30);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6030);
pStep->setName(STEP_EQ_PORT3_TYPE);
pStep->setWriteSignalDev(0xa2);
if (pEquipment->addStep(STEP_ID_PORT3_TYPE_CHANGE, pStep) != 0) {
@@ -579,7 +579,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f31);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6031);
pStep->setName(STEP_EQ_PORT3_MODE);
pStep->setWriteSignalDev(0xaa);
if (pEquipment->addStep(STEP_ID_PORT3_MODE_CHANGE, pStep) != 0) {
@@ -587,7 +587,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6f32);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6032);
pStep->setName(STEP_EQ_PORT3_CASSETTE_TYPE);
pStep->setWriteSignalDev(0xb2);
if (pEquipment->addStep(STEP_ID_PORT3_CASSETTE_TYPE_CHANGE, pStep) != 0) {
@@ -595,7 +595,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f34);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6034);
pStep->setName(STEP_EQ_PORT3_TRANSFER_MODE);
pStep->setWriteSignalDev(0xba);
if (pEquipment->addStep(STEP_ID_PORT3_TRANSFER_MODE_CHANGE, pStep) != 0) {
@@ -603,7 +603,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f35);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6035);
pStep->setName(STEP_EQ_PORT3_ENABLE);
pStep->setWriteSignalDev(0xc2);
if (pEquipment->addStep(STEP_ID_PORT3_ENABLE_MODE_CHANGE, pStep) != 0) {
@@ -611,7 +611,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f36);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6036);
pStep->setName(STEP_EQ_PORT3_TYPE_ATUO);
pStep->setWriteSignalDev(0xca);
if (pEquipment->addStep(STEP_ID_PORT3_TYPE_AUTO_CHANGE, pStep) != 0) {
@@ -621,7 +621,7 @@
// Port4
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f40);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6040);
pStep->setName(STEP_EQ_PORT4_TYPE);
pStep->setWriteSignalDev(0xa3);
if (pEquipment->addStep(STEP_ID_PORT4_TYPE_CHANGE, pStep) != 0) {
@@ -629,7 +629,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f41);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6041);
pStep->setName(STEP_EQ_PORT4_MODE);
pStep->setWriteSignalDev(0xab);
if (pEquipment->addStep(STEP_ID_PORT4_MODE_CHANGE, pStep) != 0) {
@@ -637,7 +637,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6f42);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, 0x6042);
pStep->setName(STEP_EQ_PORT4_CASSETTE_TYPE);
pStep->setWriteSignalDev(0xb3);
if (pEquipment->addStep(STEP_ID_PORT4_CASSETTE_TYPE_CHANGE, pStep) != 0) {
@@ -645,7 +645,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f44);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6044);
pStep->setName(STEP_EQ_PORT4_TRANSFER_MODE);
pStep->setWriteSignalDev(0xbb);
if (pEquipment->addStep(STEP_ID_PORT4_TRANSFER_MODE_CHANGE, pStep) != 0) {
@@ -653,7 +653,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f45);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6045);
pStep->setName(STEP_EQ_PORT4_ENABLE);
pStep->setWriteSignalDev(0xc3);
if (pEquipment->addStep(STEP_ID_PORT4_ENABLE_MODE_CHANGE, pStep) != 0) {
@@ -661,7 +661,7 @@
}
}
{
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6f46);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT16, 0x6046);
pStep->setName(STEP_EQ_PORT4_TYPE_ATUO);
pStep->setWriteSignalDev(STEP_ID_PORT4_TYPE_AUTO_CHANGE);
if (pEquipment->addStep(0xcb, pStep) != 0) {
@@ -672,53 +672,53 @@
// CEqCassetteTranserStateStep
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_EMPTY, 0xd8,
- STEP_ID_PORT1_CASSETTIE_EMPTY, 0x6f50);
+ 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, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_LOAD_READY, 0x6050);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_LOADED, 0xe8,
- STEP_ID_PORT1_CASSETTIE_LOADED, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_LOADED, 0x6050);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_INUSE, 0xf0,
- STEP_ID_PORT1_CASSETTIE_INUSE, 0x6f50);
+ 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, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_UNLOAD_READY, 0x60f50);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P1_CASSETTE_BLOCKED, 0x100,
- STEP_ID_PORT1_CASSETTIE_BLOCKED, 0x6f50);
+ STEP_ID_PORT1_CASSETTIE_BLOCKED, 0x6050);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_EMPTY, 0xd9,
- STEP_ID_PORT2_CASSETTIE_EMPTY, 0x6f70);
+ 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, 0x6f70, 0x4d7f);
+ STEP_ID_PORT2_CASSETTIE_LOAD_READY, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_LOADED, 0xe9,
- STEP_ID_PORT2_CASSETTIE_LOADED, 0x6f70);
+ STEP_ID_PORT2_CASSETTIE_LOADED, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_INUSE, 0xf1,
- STEP_ID_PORT2_CASSETTIE_INUSE, 0x6f70);
+ 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, 0x6f70);
+ STEP_ID_PORT2_CASSETTIE_UNLOAD_READY, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P2_CASSETTE_BLOCKED, 0x101,
- STEP_ID_PORT2_CASSETTIE_BLOCKED, 0x6f70);
+ STEP_ID_PORT2_CASSETTIE_BLOCKED, 0x6070);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_EMPTY, 0xda,
- STEP_ID_PORT3_CASSETTIE_EMPTY, 0x6f90);
+ 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, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_LOAD_READY, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_LOADED, 0xea,
- STEP_ID_PORT3_CASSETTIE_INUSE, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_INUSE, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_INUSE, 0xf2,
- STEP_ID_PORT3_CASSETTIE_INUSE, 0x6f90);
+ 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, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_UNLOAD_READY, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P3_CASSETTE_BLOCKED, 0x102,
- STEP_ID_PORT3_CASSETTIE_BLOCKED, 0x6f90);
+ STEP_ID_PORT3_CASSETTIE_BLOCKED, 0x6090);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_EMPTY, 0xdb,
- STEP_ID_PORT4_CASSETTIE_EMPTY, 0x6fb0);
+ 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, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_LOAD_READY, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_LOADED, 0xeb,
- STEP_ID_PORT4_CASSETTIE_LOADED, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_LOADED, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_INUSE, 0xf3,
- STEP_ID_PORT4_CASSETTIE_INUSE, 0x6fb0);
+ 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, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_UNLOAD_READY, 0x60b0);
ADD_EQ_CASSETTE_TRANSFER_STATE_STEP(STEP_EQ_P4_CASSETTE_BLOCKED, 0x103,
- STEP_ID_PORT4_CASSETTIE_BLOCKED, 0x6fb0);
+ STEP_ID_PORT4_CASSETTIE_BLOCKED, 0x60b0);
pEquipment->init();
LOGE("已添加“EFEM(ROBOT)”.");
@@ -737,7 +737,7 @@
pEquipment->setName(index == 0 ? "Bonder 1" : "Bonder 2");
pEquipment->setDescription(index == 0 ? "Bonder 1." : "Bonder 2.");
pEquipment->setStation(0, 255);
- pEquipment->setReadBitBlock(index == 0 ? 0x4b00 : 0x5600,
+ pEquipment->setReadBitBlock(index == 0 ? 0x3b00 : 0x4600,
index == 0 ? 0x5600 : 0x6100);
addToEquipmentList(pEquipment);
@@ -747,7 +747,7 @@
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
pStep->setWriteSignalDev(index == 0 ? 0x350 : 0x650);
- pStep->setModeDev(index == 0 ? 0xad7d : 0xee7d);
+ pStep->setModeDev(index == 0 ? 0x9d7d : 0xdd7d);
if (pEquipment->addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
delete pStep;
}
@@ -756,7 +756,7 @@
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
pStep->setWriteSignalDev(index == 0 ? 0x351 : 0x651);
- pStep->setStatusDev(index == 0 ? 0xad59 : 0xee59);
+ pStep->setStatusDev(index == 0 ? 0x9d59 : 0xdd59);
if (pEquipment->addStep(STEP_ID_EQSTATUS_CHANGED, pStep) != 0) {
delete pStep;
}
@@ -765,7 +765,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK1);
pStep->setWriteSignalDev(index == 0 ? 0x352 : 0x652);
- pStep->setAlarmDev(index == 0 ? 0xaf0e : 0xf00e);
+ pStep->setAlarmDev(index == 0 ? 0x9f0e : 0xdf0e);
if (pEquipment->addStep(STEP_ID_EQALARM1, pStep) != 0) {
delete pStep;
}
@@ -774,7 +774,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK2);
pStep->setWriteSignalDev(index == 0 ? 0x353 : 0x653);
- pStep->setAlarmDev(index == 0 ? 0xaf3b : 0xf03b);
+ pStep->setAlarmDev(index == 0 ? 0x9f3b : 0xdf3b);
if (pEquipment->addStep(STEP_ID_EQALARM2, pStep) != 0) {
delete pStep;
}
@@ -783,7 +783,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK3);
pStep->setWriteSignalDev(index == 0 ? 0x354 : 0x654);
- pStep->setAlarmDev(index == 0 ? 0xaf8e : 0xf068);
+ pStep->setAlarmDev(index == 0 ? 0x9f68 : 0xdf68);
if (pEquipment->addStep(STEP_ID_EQALARM3, pStep) != 0) {
delete pStep;
}
@@ -792,7 +792,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK4);
pStep->setWriteSignalDev(index == 0 ? 0x355 : 0x655);
- pStep->setAlarmDev(index == 0 ? 0xaf95 : 0xf095);
+ pStep->setAlarmDev(index == 0 ? 0x9f95 : 0xdf95);
if (pEquipment->addStep(STEP_ID_EQALARM4, pStep) != 0) {
delete pStep;
}
@@ -801,7 +801,7 @@
CEqAlarmStep* pStep = new CEqAlarmStep();
pStep->setName(STEP_ALARM_BLOCK5);
pStep->setWriteSignalDev(index == 0 ? 0x356 : 0x656);
- pStep->setAlarmDev(index == 0 ? 0xafc2 : 0xf0c2);
+ pStep->setAlarmDev(index == 0 ? 0x9fc2 : 0xdfc2);
if (pEquipment->addStep(STEP_ID_EQALARM5, pStep) != 0) {
delete pStep;
}
@@ -810,7 +810,7 @@
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
pStep->setWriteSignalDev(index == 0 ? 0x357 : 0x657);
- pStep->setProcessDev(index == 0 ? 0xbb55 : 0xfc55);
+ pStep->setProcessDev(index == 0 ? 0xab55 : 0xeb55);
if (pEquipment->addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
delete pStep;
}
@@ -835,7 +835,7 @@
}
{
// CIM Message Confirm
- CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, index == 0 ? 0xad80 : 0xee80);
+ CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, index == 0 ? 0x9d80 : 0xdd80);
pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
pStep->setWriteSignalDev(index == 0 ? 0x359 : 0x659);
if (pEquipment->addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
@@ -873,7 +873,7 @@
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_RECEIVED_JOB_UPS1);
pStep->setWriteSignalDev(index == 0 ? 0x300 : 0x600);
- pStep->setJobDataDev(index == 0 ? 0x9510 : 0xd610);
+ pStep->setJobDataDev(index == 0 ? 0x8c90 : 0xcc90);
if (pEquipment->addStep(STEP_ID_RECIVE_JOB_UPS1, pStep) != 0) {
delete pStep;
}
@@ -882,7 +882,7 @@
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_RECEIVED_JOB_UPS2);
pStep->setWriteSignalDev(index == 0 ? 0x301 : 0x601);
- pStep->setJobDataDev(index == 0 ? 0x9650 : 0xd750);
+ pStep->setJobDataDev(index == 0 ? 0x8dd0 : 0xcdd0);
if (pEquipment->addStep(STEP_ID_RECIVE_JOB_UPS2, pStep) != 0) {
delete pStep;
}
@@ -891,7 +891,7 @@
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS1);
pStep->setWriteSignalDev(index == 0 ? 0x310 : 0x610);
- pStep->setJobDataDev(index == 0 ? 0x8100 : 0xc200);
+ pStep->setJobDataDev(index == 0 ? 0x8000 : 0xc000);
if (pEquipment->addStep(STEP_ID_SENT_OUT_JOB_DOWNS1, pStep) != 0) {
delete pStep;
}
@@ -900,7 +900,7 @@
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS2);
pStep->setWriteSignalDev(index == 0 ? 0x311 : 0x611);
- pStep->setJobDataDev(index == 0 ? 0x8240 : 0xc340);
+ pStep->setJobDataDev(index == 0 ? 0x8140 : 0xc140);
if (pEquipment->addStep(STEP_ID_SENT_OUT_JOB_DOWNS2, pStep) != 0) {
delete pStep;
}
--
Gitblit v1.9.3