From a8ce9111f9f907afd921609d1828744cead9bd52 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 25 四月 2025 09:40:37 +0800
Subject: [PATCH] 1.将CJobDataB修改为CJobDataA
---
SourceCode/Bond/Servo/Servo.vcxproj | 4 +-
SourceCode/Bond/Servo/Servo.vcxproj.filters | 4 +-
SourceCode/Bond/Servo/CEqJobEventStep.cpp | 22 +++++-----
SourceCode/Bond/Servo/CJobDataA.cpp | 26 ++++++------
SourceCode/Bond/Servo/CJobDataA.h | 6 +-
SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp | 6 +-
SourceCode/Bond/Servo/CEqJobEventStep.h | 6 +-
SourceCode/Bond/Servo/CLoadPort.h | 2
SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp | 4 +-
SourceCode/Bond/Servo/CLoadPort.cpp | 4 +-
SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h | 4 +-
11 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp b/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp
index c59ab4d..fd4b4a8 100644
--- a/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp
+++ b/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.cpp
@@ -23,17 +23,17 @@
int jobExistenceSize,
short slotProcess,
short jopCount,
- CJobDataB* pJobDataB)
+ CJobDataA* pJobDataA)
{
ASSERT(jobExistenceSize == 12);
- ASSERT(pJobDataB);
+ ASSERT(pJobDataA);
char szBuffer[1024] = { 0 };
memcpy(&szBuffer[0], &cmd, sizeof(short));
memcpy(&szBuffer[2], jobExistence, sizeof(short) * jobExistenceSize);
memcpy(&szBuffer[26], &slotProcess, sizeof(short));
memcpy(&szBuffer[36], &jopCount, sizeof(short));
- int nLen = pJobDataB->serialize(&szBuffer[38], 1024 - 38);
+ int nLen = pJobDataA->serialize(&szBuffer[38], 1024 - 38);
return writeData(m_nCtrlCmdDev, (const char*)szBuffer, 38 + nLen);
}
diff --git a/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h b/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h
index f0efa38..e86ca92 100644
--- a/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h
+++ b/SourceCode/Bond/Servo/CEqCassetteCtrlCmdStep.h
@@ -1,6 +1,6 @@
#pragma once
#include "CWriteStep.h"
-#include "CJobDataB.h"
+#include "CJobDataA.h"
namespace SERVO {
@@ -17,7 +17,7 @@
int jobExistenceSize,
short slotProcess,
short jopCount,
- CJobDataB* pJobDataB);
+ CJobDataA* pJobDataA);
void getAttributeVector(CAttributeVector& attrubutes);
private:
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.cpp b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
index 43bff4d..724f000 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.cpp
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.cpp
@@ -27,18 +27,18 @@
attrubutes.addAttribute(new CAttribute("Dev",
("W" + CToolUnits::toHexString(m_nJobDataBDev, strTemp)).c_str(), ""));
attrubutes.addAttribute(new CAttribute("PortNo",
- std::to_string(m_jobDataB.getPortNo()).c_str(), ""));
+ std::to_string(m_jobDataA.getPortNo()).c_str(), ""));
attrubutes.addAttribute(new CAttribute("CarrierId",
- m_jobDataB.getCarrierId().c_str(), ""));
+ m_jobDataA.getCarrierId().c_str(), ""));
attrubutes.addAttribute(new CAttribute("PruductId",
- m_jobDataB.getPruductId().c_str(), ""));
+ m_jobDataA.getPruductId().c_str(), ""));
attrubutes.addAttribute(new CAttribute("CarrierState",
- m_jobDataB.getCarrierStateDescription(strTemp).c_str(), ""));
+ m_jobDataA.getCarrierStateDescription(strTemp).c_str(), ""));
attrubutes.addAttribute(new CAttribute("SlotMapping",
- std::to_string(m_jobDataB.getSlotMapping()).c_str(), ""));
+ std::to_string(m_jobDataA.getSlotMapping()).c_str(), ""));
attrubutes.addAttribute(new CAttribute("SlotSelectedFlag",
- std::to_string(m_jobDataB.getSlotSelectedFlag()).c_str(), ""));
- std::vector<std::string>& ids = m_jobDataB.getGlassIds();
+ std::to_string(m_jobDataA.getSlotSelectedFlag()).c_str(), ""));
+ std::vector<std::string>& ids = m_jobDataA.getGlassIds();
for (int i = 0; i < ids.size(); i++) {
attrubutes.addAttribute(new CAttribute((std::string("GlassId") + std::to_string(i+1)).c_str(),
ids[i].c_str(), ""));
@@ -57,8 +57,8 @@
return -1;
}
- m_jobDataB.unserialize(szBuffer, 640);
- LOGI("<CEqJobEventStep-%s>Read JobDataB\n", m_strName.c_str());
+ m_jobDataA.unserialize(szBuffer, 640);
+ LOGI("<CEqJobEventStep-%s>Read JobDataA\n", m_strName.c_str());
return 0;
}
@@ -79,8 +79,8 @@
return 0;
}
- CJobDataB* CEqJobEventStep::getJobDataB()
+ CJobDataA* CEqJobEventStep::getJobDataA()
{
- return &m_jobDataB;
+ return &m_jobDataA;
}
}
diff --git a/SourceCode/Bond/Servo/CEqJobEventStep.h b/SourceCode/Bond/Servo/CEqJobEventStep.h
index f2b1c70..71e7e77 100644
--- a/SourceCode/Bond/Servo/CEqJobEventStep.h
+++ b/SourceCode/Bond/Servo/CEqJobEventStep.h
@@ -1,6 +1,6 @@
#pragma once
#include "CReadStep.h"
-#include "CJobDataB.h"
+#include "CJobDataA.h"
namespace SERVO {
@@ -16,11 +16,11 @@
virtual int onComplete();
virtual int onTimeout();
void setJobDataDev(int nDev);
- CJobDataB* getJobDataB();
+ CJobDataA* getJobDataA();
private:
int m_nJobDataBDev;
- CJobDataB m_jobDataB;
+ CJobDataA m_jobDataA;
};
}
diff --git a/SourceCode/Bond/Servo/CJobDataB.cpp b/SourceCode/Bond/Servo/CJobDataA.cpp
similarity index 82%
rename from SourceCode/Bond/Servo/CJobDataB.cpp
rename to SourceCode/Bond/Servo/CJobDataA.cpp
index 8373485..4c5e3e4 100644
--- a/SourceCode/Bond/Servo/CJobDataB.cpp
+++ b/SourceCode/Bond/Servo/CJobDataA.cpp
@@ -1,35 +1,35 @@
#include "stdafx.h"
-#include "CJobDataB.h"
+#include "CJobDataA.h"
#include "ToolUnits.h"
namespace SERVO {
- CJobDataB::CJobDataB()
+ CJobDataA::CJobDataA()
{
}
- CJobDataB::~CJobDataB()
+ CJobDataA::~CJobDataA()
{
}
- short CJobDataB::getPortNo()
+ short CJobDataA::getPortNo()
{
return m_nPortNo;
}
- std::string& CJobDataB::getCarrierId()
+ std::string& CJobDataA::getCarrierId()
{
return m_strCarrierId;
}
- std::string& CJobDataB::getPruductId()
+ std::string& CJobDataA::getPruductId()
{
return m_pruductId;
}
- int CJobDataB::serialize(char* pszBuffer, int nBufferSize)
+ int CJobDataA::serialize(char* pszBuffer, int nBufferSize)
{
if (nBufferSize < 640) return -1;
@@ -64,7 +64,7 @@
return 320 * 2;
}
- int CJobDataB::unserialize(char* pszBuffer, int nBufferSize)
+ int CJobDataA::unserialize(char* pszBuffer, int nBufferSize)
{
if (nBufferSize < 640) return -1;
@@ -100,12 +100,12 @@
return 320 * 2;
}
- short CJobDataB::getCarrierState()
+ short CJobDataA::getCarrierState()
{
return m_nCarrierState;
}
- std::string& CJobDataB::getCarrierStateDescription(std::string& strDescription)
+ std::string& CJobDataA::getCarrierStateDescription(std::string& strDescription)
{
static char* pszDescription[20] = {
"Bind",
@@ -140,17 +140,17 @@
return strDescription;
}
- int CJobDataB::getSlotMapping()
+ int CJobDataA::getSlotMapping()
{
return m_nSlotMapping;
}
- int CJobDataB::getSlotSelectedFlag()
+ int CJobDataA::getSlotSelectedFlag()
{
return m_nSlotSelectedFlag;
}
- std::vector<std::string>& CJobDataB::getGlassIds()
+ std::vector<std::string>& CJobDataA::getGlassIds()
{
return m_glassIds;
}
diff --git a/SourceCode/Bond/Servo/CJobDataB.h b/SourceCode/Bond/Servo/CJobDataA.h
similarity index 93%
rename from SourceCode/Bond/Servo/CJobDataB.h
rename to SourceCode/Bond/Servo/CJobDataA.h
index 632285b..86b761a 100644
--- a/SourceCode/Bond/Servo/CJobDataB.h
+++ b/SourceCode/Bond/Servo/CJobDataA.h
@@ -4,11 +4,11 @@
namespace SERVO {
- class CJobDataB
+ class CJobDataA
{
public:
- CJobDataB();
- ~CJobDataB();
+ CJobDataA();
+ ~CJobDataA();
public:
short getPortNo();
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index f736ee1..3e93d7c 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -92,7 +92,7 @@
int jobExistenceSize,
short slotProcess,
short jopCount,
- CJobDataB* pJobDataB)
+ CJobDataA* pJobDataA)
{
int id = getID();
if ( !(id == EQ_ID_LOADPORT1 || id == EQ_ID_LOADPORT2) ) {
@@ -102,7 +102,7 @@
SERVO::CEqCassetteCtrlCmdStep* pStep = (SERVO::CEqCassetteCtrlCmdStep*)getCassetteCtrlCmdStep();
ASSERT(pStep);
- return pStep->sendCtrlCmd(cmd, jobExistence, jobExistenceSize, slotProcess, jopCount, pJobDataB);
+ return pStep->sendCtrlCmd(cmd, jobExistence, jobExistenceSize, slotProcess, jopCount, pJobDataA);
}
CStep* CLoadPort::getCassetteCtrlCmdStep()
diff --git a/SourceCode/Bond/Servo/CLoadPort.h b/SourceCode/Bond/Servo/CLoadPort.h
index a6b2831..69aff38 100644
--- a/SourceCode/Bond/Servo/CLoadPort.h
+++ b/SourceCode/Bond/Servo/CLoadPort.h
@@ -28,7 +28,7 @@
int jobExistenceSize,
short slotProcess,
short jopCount,
- CJobDataB* pJobDataB);
+ CJobDataA* pJobDataA);
CStep* getCassetteCtrlCmdStep();
};
}
diff --git a/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp b/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
index 16f72f7..0b36e1e 100644
--- a/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
+++ b/SourceCode/Bond/Servo/CPageCassetteCtrlCmd.cpp
@@ -98,7 +98,7 @@
int jobExistenceSize = 12;
short slotProcess = 0;
short jobCount = 0;
- SERVO::CJobDataB* pJobDataB = new SERVO::CJobDataB();
+ SERVO::CJobDataA* pJobDataA = new SERVO::CJobDataA();
CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_CASSETTE_CTRL_CMD);
@@ -112,5 +112,5 @@
pLoadPort->sendCassetteCtrlCmd(cmd, &jobExistence[0], jobExistenceSize, slotProcess,
- jobCount, pJobDataB);
+ jobCount, pJobDataA);
}
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 1d85c06..f44aa10 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -227,7 +227,7 @@
<ClInclude Include="CGlass.h" />
<ClInclude Include="CHMPropertyDlg.h" />
<ClInclude Include="CHMPropertyPage.h" />
- <ClInclude Include="CJobDataB.h" />
+ <ClInclude Include="CJobDataA.h" />
<ClInclude Include="CLoadPort.h" />
<ClInclude Include="CMeasurement.h" />
<ClInclude Include="ColorTransfer.h" />
@@ -307,7 +307,7 @@
<ClCompile Include="CGlass.cpp" />
<ClCompile Include="CHMPropertyDlg.cpp" />
<ClCompile Include="CHMPropertyPage.cpp" />
- <ClCompile Include="CJobDataB.cpp" />
+ <ClCompile Include="CJobDataA.cpp" />
<ClCompile Include="CLoadPort.cpp" />
<ClCompile Include="CMeasurement.cpp" />
<ClCompile Include="ColorTransfer.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 8030cf0..0c1fbc0 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -83,7 +83,7 @@
<ClCompile Include="CEqReadIntStep.cpp" />
<ClCompile Include="CEqCassetteTransferStateStep.cpp" />
<ClCompile Include="CEqCassetteCtrlCmdStep.cpp" />
- <ClCompile Include="CJobDataB.cpp" />
+ <ClCompile Include="CJobDataA.cpp" />
<ClCompile Include="CPageCassetteCtrlCmd.cpp" />
<ClCompile Include="CEqJobEventStep.cpp" />
</ItemGroup>
@@ -167,7 +167,7 @@
<ClInclude Include="CEqReadIntStep.h" />
<ClInclude Include="CEqCassetteTransferStateStep.h" />
<ClInclude Include="CEqCassetteCtrlCmdStep.h" />
- <ClInclude Include="CJobDataB.h" />
+ <ClInclude Include="CJobDataA.h" />
<ClInclude Include="CPageCassetteCtrlCmd.h" />
<ClInclude Include="CEqJobEventStep.h" />
</ItemGroup>
--
Gitblit v1.9.3