From 29623a829f040af2cd27fd6c477d54294063a0ea Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 09 五月 2025 10:46:34 +0800
Subject: [PATCH] 1.部分Dev地址修改
---
SourceCode/Bond/Servo/CJobDataB.h | 2 +
SourceCode/Bond/Servo/CEquipment.cpp | 2
SourceCode/Bond/Servo/CJobDataB.cpp | 36 ++++++++++++++++++
SourceCode/Bond/Servo/CBonder.cpp | 28 +++++++-------
4 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 0a0842a..2596d31 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -47,7 +47,7 @@
// eq mode
CEqModeStep* pStep = new CEqModeStep();
pStep->setName(STEP_MODE);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x350 : 0x650);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x340 : 0x640);
pStep->setModeDev(m_nIndex == 0 ? 0x9d7d : 0xdd7d);
if (addStep(STEP_ID_EQMODE_CHANGED, pStep) != 0) {
delete pStep;
@@ -58,7 +58,7 @@
// eq status
CEqStatusStep* pStep = new CEqStatusStep();
pStep->setName(STEP_STATUS);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x351 : 0x651);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x341 : 0x641);
pStep->setStatusDev(m_nIndex == 0 ? 0x9d59 : 0xdd59);
if (addStep(STEP_ID_EQSTATUS_CHANGED, pStep) != 0) {
delete pStep;
@@ -70,8 +70,8 @@
static char* pszName[] = { STEP_ALARM_BLOCK1, STEP_ALARM_BLOCK2, STEP_ALARM_BLOCK3, STEP_ALARM_BLOCK4, STEP_ALARM_BLOCK5 };
static int dev[2][5] = { { 0x9f0e , 0x9f3b, 0x9f68, 0x9f95, 0x9fc2 },
{ 0xdf0e , 0xdf3b, 0xdf68, 0xdf95, 0xdfc2 } };
- static int writeSignalDev[2][5] = { { 0x352, 0x353, 0x354, 0x355, 0x356 },
- { 0x652, 0x653, 0x654, 0x655, 0x656 } };
+ static int writeSignalDev[2][5] = { { 0x342, 0x343, 0x344, 0x345, 0x346 },
+ { 0x642, 0x643, 0x644, 0x645, 0x646 } };
static int addr[] = { STEP_ID_EQALARM1, STEP_ID_EQALARM2, STEP_ID_EQALARM3, STEP_ID_EQALARM4, STEP_ID_EQALARM5 };
for (int i = 0; i < 5; i++) {
@@ -90,7 +90,7 @@
// eq process
CEqProcessStep* pStep = new CEqProcessStep();
pStep->setName(STEP_PROCESS);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x357 : 0x657);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x347 : 0x647);
pStep->setProcessDev(m_nIndex == 0 ? 0xab55 : 0xeb55);
if (addStep(STEP_ID_PROCESS_DATA_REPORT, pStep) != 0) {
delete pStep;
@@ -101,7 +101,7 @@
// eq cim mode change
CEqCimModeChangeStep* pStep = new CEqCimModeChangeStep();
pStep->setName(STEP_CIM_MODE_CHANGE);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x370 : 0x670);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x360 : 0x660);
pStep->setCimModeDev(m_nIndex == 0 ? 0x965 : 0x12b5);
if (addStep(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -112,8 +112,8 @@
// eq cim message cmd
CEqCimMessageCmdStep* pStep = new CEqCimMessageCmdStep();
pStep->setName(STEP_CIM_MESSAGE_CMD);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x371 : 0x671);
- pStep->setCimMessageDev(m_nIndex == 0 ? 0x950 : 0x12a0);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x361 : 0x661);
+ pStep->setCimMessageDev(m_nIndex == 0 ? 0x963 : 0x12b3);
if (addStep(STEP_ID_CIM_MSG_SET_CMD_REPLY, pStep) != 0) {
delete pStep;
}
@@ -134,7 +134,7 @@
// CIM Message Confirm
CEqReadIntStep* pStep = new CEqReadIntStep(__INT32, m_nIndex == 0 ? 0x9d80 : 0xdd80);
pStep->setName(STEP_EQ_CIM_MESSAGE_CONFIRM);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x359 : 0x659);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x349 : 0x649);
if (addStep(STEP_ID_CIM_MSG_CONFIRM_REPORT, pStep) != 0) {
delete pStep;
}
@@ -143,7 +143,7 @@
{
CEqCimMessageClearStep* pStep = new CEqCimMessageClearStep();
pStep->setName(STEP_CIM_MESSAGE_CLEAR);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x372 : 0x672);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x362 : 0x662);
pStep->setClearCimMessageDev(m_nIndex == 0 ? 0x963 : 0x12b3);
if (addStep(STEP_ID_CIM_MSG_CLEAR_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -154,7 +154,7 @@
{
CEqDateTimeSetCmdStep* pStep = new CEqDateTimeSetCmdStep();
pStep->setName(STEP_DATETIME_SET_CMD);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x373 : 0x673);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x363 : 0x663);
pStep->setDateTimeDev(m_nIndex == 0 ? 0x966 : 0x12b6);
if (addStep(STEP_ID_DATETIME_SET_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -164,7 +164,7 @@
{
CEqModeChangeStep* pStep = new CEqModeChangeStep();
pStep->setName(STEP_EQ_MODE_CHANGE);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x375 : 0x675);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x365 : 0x665);
pStep->setEqModeDev(m_nIndex == 0 ? 0x96E : 0x12be);
if (addStep(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pStep) != 0) {
delete pStep;
@@ -254,7 +254,7 @@
{
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS1);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x310 : 0x610);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x30a : 0x60a);
pStep->setJobDataDev(m_nIndex == 0 ? 0x8000 : 0xc000);
if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS1, pStep) != 0) {
delete pStep;
@@ -263,7 +263,7 @@
{
CEqJobEventStep* pStep = new CEqJobEventStep();
pStep->setName(STEP_EQ_SENT_OUT_JOB_DOWNS2);
- pStep->setWriteSignalDev(m_nIndex == 0 ? 0x311 : 0x611);
+ pStep->setWriteSignalDev(m_nIndex == 0 ? 0x30b : 0x60b);
pStep->setJobDataDev(m_nIndex == 0 ? 0x8140 : 0xc140);
if (addStep(STEP_ID_SENT_OUT_JOB_DOWNS2, pStep) != 0) {
delete pStep;
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 35864f8..b2e3ad3 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -319,7 +319,7 @@
// 以下解释和处理数据
BOOL bFlag;
- int index = 0x840;
+ int index = 0x540;
// alive
diff --git a/SourceCode/Bond/Servo/CJobDataB.cpp b/SourceCode/Bond/Servo/CJobDataB.cpp
index cf25ff2..c269779 100644
--- a/SourceCode/Bond/Servo/CJobDataB.cpp
+++ b/SourceCode/Bond/Servo/CJobDataB.cpp
@@ -1,5 +1,6 @@
#include "stdafx.h"
#include "CJobDataB.h"
+#include "ToolUnits.h"
namespace SERVO {
@@ -43,4 +44,39 @@
{
m_strGlassId = pszGlassId;
}
+
+ int CJobDataB::serialize(char* pszBuffer, int nBufferSize)
+ {
+ if (nBufferSize < 28) return -1;
+
+ int index = 0;
+ memcpy(&pszBuffer[index], &m_nCassetteSequenceNo, sizeof(short));
+ index += sizeof(short);
+
+ memcpy(&pszBuffer[index], &m_nJobSequenceNo, sizeof(short));
+ index += sizeof(short);
+
+ int strLen = min(20, m_strGlassId.size());
+ memcpy(&pszBuffer[index], m_strGlassId.c_str(), strLen);
+ index += 20;
+
+ return 14 * 2;
+ }
+
+ int CJobDataB::unserialize(char* pszBuffer, int nBufferSize)
+ {
+ if (nBufferSize < 14) return -1;
+
+ int index = 0;
+ memcpy(&m_nCassetteSequenceNo, &pszBuffer[index], sizeof(short));
+ index += sizeof(short);
+
+ memcpy(&m_nJobSequenceNo, &pszBuffer[index], sizeof(short));
+ index += sizeof(short);
+
+ CToolUnits::convertString(&pszBuffer[index], 20, m_strGlassId);
+ index += 20;
+
+ return 14 * 2;
+ }
}
diff --git a/SourceCode/Bond/Servo/CJobDataB.h b/SourceCode/Bond/Servo/CJobDataB.h
index 589ba72..a02cb98 100644
--- a/SourceCode/Bond/Servo/CJobDataB.h
+++ b/SourceCode/Bond/Servo/CJobDataB.h
@@ -15,6 +15,8 @@
void setJobSequenceNo(int no);
std::string& getGlassId();
void setGlassId(const char* pszGlassId);
+ int serialize(char* pszBuffer, int nBufferSize);
+ int unserialize(char* pszBuffer, int nBufferSize);
private:
int m_nCassetteSequenceNo;
--
Gitblit v1.9.3