From 6d71f1d8264b929ca71bf133246b894ed955c079 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 12 六月 2025 15:17:50 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 9 +
SourceCode/Bond/Servo/Servo.vcxproj | 2
Document/ESWIN_Machine_Data_Collection_Bonder_VendorName_Machine_v1.1_yymmdd.xlsx | 0
.gitignore | 1
SourceCode/Bond/Servo/resource.h | 0
SourceCode/Bond/Servo/CPageLinkSignal.h | 40 ++++++
SourceCode/Bond/Servo/CPageLinkSignal.cpp | 180 ++++++++++++++++++++++++++++++
SourceCode/Bond/Servo/Servo.vcxproj.filters | 2
SourceCode/Bond/Servo/CEquipment.cpp | 51 ++++++++
SourceCode/Bond/Servo/Servo.rc | 0
SourceCode/Bond/Servo/CEFEM.cpp | 34 +++++
SourceCode/Bond/Servo/CEquipment.h | 2
Document/Echint _EFEM_SECSGEM（最新版）.xls | 0
SourceCode/Bond/Servo/CBonder.cpp | 34 +++++
SourceCode/Bond/Servo/Common.h | 4
15 files changed, 357 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index cde4f6a..531b386 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
Document/鍏变韩鏂囦欢澶�/
Document/鍏变韩鏂囦欢澶�.rar
SourceCode/Bond/x64/Debug/Master.dat
+SourceCode/Bond/x64/Debug/Config/signals.csv
diff --git a/Document/ESWIN_Machine_Data_Collection_Bonder_VendorName_Machine_v1.1_yymmdd.xlsx b/Document/ESWIN_Machine_Data_Collection_Bonder_VendorName_Machine_v1.1_yymmdd.xlsx
new file mode 100644
index 0000000..656f908
--- /dev/null
+++ b/Document/ESWIN_Machine_Data_Collection_Bonder_VendorName_Machine_v1.1_yymmdd.xlsx
Binary files differ
diff --git "a/Document/Echint _EFEM_SECSGEM\357\274\210\346\234\200\346\226\260\347\211\210\357\274\211.xls" "b/Document/Echint _EFEM_SECSGEM\357\274\210\346\234\200\346\226\260\347\211\210\357\274\211.xls"
new file mode 100644
index 0000000..8ba22d8
--- /dev/null
+++ "b/Document/Echint _EFEM_SECSGEM\357\274\210\346\234\200\346\226\260\347\211\210\357\274\211.xls"
Binary files differ
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index 4a48f1e..42a7a08 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -334,6 +334,40 @@
}
}
}
+
+ {
+ // Panel Data Report
+ CEqReadStep* pStep = new CEqReadStep(0xA17f, 386 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodePanelDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x45e);
+ if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // FAC Data Report
+ CEqReadStep* pStep = new CEqReadStep(0xA60E, 108 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodePanelDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_FAC_DATA_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x34d);
+ if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
}
// 必须要实现的虚函数，在此初始化Slot信息
diff --git a/SourceCode/Bond/Servo/CEFEM.cpp b/SourceCode/Bond/Servo/CEFEM.cpp
index 2ff94a2..9732129 100644
--- a/SourceCode/Bond/Servo/CEFEM.cpp
+++ b/SourceCode/Bond/Servo/CEFEM.cpp
@@ -626,6 +626,40 @@
delete pStep;
}
}
+
+ {
+ // Panel Data Report
+ CEqReadStep* pStep = new CEqReadStep(0x617f, 386 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodePanelDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_PANEL_DATA_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x15e);
+ if (addStep(STEP_ID_PANEL_DATA_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
+
+ {
+ // FAC Data Report
+ CEqReadStep* pStep = new CEqReadStep(0x6301, 108 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodePanelDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_FAC_DATA_REPORT);
+ pStep->setProp("Port", (void*)1);
+ pStep->setWriteSignalDev(0x04d);
+ if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
+ delete pStep;
+ }
+ }
}
// 必须要实现的虚函数，在此初始化Slot信息
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 698d2c2..7f10e53 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1474,6 +1474,57 @@
return 0;
}
+ int CEquipment::decodePanelDataReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ short cassetteNo, jobSequenceNo;
+ int index = 0;
+ std::string strPanelJudgeData, strPanelGradeData;
+ memcpy(&cassetteNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
+ index += 128 * 2;
+ CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
+ index += 256 * 2;
+
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("CassetteNo",
+ std::to_string(cassetteNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("JobSequenceNo",
+ std::to_string(jobSequenceNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("PanelJudgeData",
+ strPanelJudgeData.c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("PanelGradeData",
+ strPanelGradeData.c_str(), "", weight++));
+
+
+ return 0;
+ }
+
+ int CEquipment::decodeFacDataReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ int index = 0;
+ std::string strSvTimeRecord, strSvData;
+ CToolUnits::convertString(&pszData[index], 8 * 2, strSvTimeRecord);
+ index += 128 * 2;
+ CToolUnits::convertString(&pszData[index], 640 * 2, strSvData);
+ index += 256 * 2;
+
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("SV Time Record",
+ strSvTimeRecord.c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SV Data",
+ strSvData.c_str(), "", weight++));
+
+
+ return 0;
+ }
+
int CEquipment::onPreStoredJob(int port, CJobDataB* pJobDataB, short& putSlot)
{
LOGI("<CEquipment-%s>onPreStoredJob:port:%d|GlassId:%s",
diff --git a/SourceCode/Bond/Servo/CEquipment.h b/SourceCode/Bond/Servo/CEquipment.h
index da67314..a9dfdf7 100644
--- a/SourceCode/Bond/Servo/CEquipment.h
+++ b/SourceCode/Bond/Servo/CEquipment.h
@@ -216,6 +216,8 @@
int decodeFetchedOutJobReport(CStep* pStep, int port, const char* pszData, size_t size);
int decodeStoredJobReport(CStep* pStep, int port, const char* pszData, size_t size);
int decodeVCREventReport(CStep* pStep, const char* pszData, size_t size);
+ int decodePanelDataReport(CStep* pStep, const char* pszData, size_t size);
+ int decodeFacDataReport(CStep* pStep, const char* pszData, size_t size);
int addJobDataB(CJobDataB* pJobDataB);
int removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
CJobDataB* getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo);
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index d095b21..45a272b 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -9,6 +9,7 @@
#include "CEquipmentPage1.h"
#include "CEquipmentPage2.h"
#include "CEquipmentPage3.h"
+#include "CPageLinkSignal.h"
#include "CPagePortProperty.h"
#include "CPagePortStatus.h"
#include "CPageCassetteCtrlCmd.h"
@@ -128,9 +129,9 @@
CHMPropertyDlg dlg(pEquipment->getName().c_str(), 658, 788);
- CEquipmentPage1* pPage1 = new CEquipmentPage1();
+ CPageLinkSignal* pPage1 = new CPageLinkSignal();
pPage1->setEquipment(pEquipment);
- pPage1->Create(IDD_PAGE_EQUIPMENT1);
+ pPage1->Create(IDD_PAGE_LINK_SIGNAL);
dlg.addPage(pPage1, "Link Signal");
if (_strcmpi(pEquipment->getClassName(), "CLoadPort") == 0) {
@@ -292,6 +293,10 @@
pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, FALSE);
+ pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_TROUBLE, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_SEND_ABLE, FALSE);
}
}
else if (nCmd == ID_EQSGRAPHITEM_TEST6) {
diff --git a/SourceCode/Bond/Servo/CPageLinkSignal.cpp b/SourceCode/Bond/Servo/CPageLinkSignal.cpp
new file mode 100644
index 0000000..ca7ee40
--- /dev/null
+++ b/SourceCode/Bond/Servo/CPageLinkSignal.cpp
@@ -0,0 +1,180 @@
+锘�// CPageLinkSignal.cpp: 瀹炵幇鏂囦欢
+//
+
+#include "stdafx.h"
+#include "Servo.h"
+#include "CPageLinkSignal.h"
+#include "afxdialogex.h"
+
+
+#define FACECOLOR_ON RGB(34, 177, 76)
+#define FACECOLOR_OFF RGB(195, 195, 195)
+
+#define TIMER_ID_SIGNAL_UPDATE 1001
+#define TIMER_INTERVAL_MS 1000 // 姣� 1 绉掓洿鏂颁竴娆�
+
+// CPageLinkSignal 瀵硅瘽妗�
+
+IMPLEMENT_DYNAMIC(CPageLinkSignal, CHMPropertyPage)
+
+CPageLinkSignal::CPageLinkSignal(CWnd* pParent /*=nullptr*/)
+ : CHMPropertyPage(IDD_PAGE_LINK_SIGNAL, pParent)
+{
+ m_pEquipment = nullptr;
+}
+
+CPageLinkSignal::~CPageLinkSignal()
+{
+}
+
+void CPageLinkSignal::DoDataExchange(CDataExchange* pDX)
+{
+ CHMPropertyPage::DoDataExchange(pDX);
+}
+
+
+BEGIN_MESSAGE_MAP(CPageLinkSignal, CHMPropertyPage)
+ ON_WM_CTLCOLOR()
+ ON_WM_DESTROY()
+ ON_WM_SIZE()
+ ON_WM_TIMER()
+END_MESSAGE_MAP()
+
+
+// CPageLinkSignal 娑堟伅澶勭悊绋嬪簭
+
+void CPageLinkSignal::setEquipment(SERVO::CEquipment* pEquipment)
+{
+ m_pEquipment = pEquipment;
+}
+
+BOOL CPageLinkSignal::OnInitDialog()
+{
+ CHMPropertyPage::OnInitDialog();
+ CreateSignalButtons();
+
+
+ KillTimer(TIMER_ID_SIGNAL_UPDATE);
+ SetTimer(TIMER_ID_SIGNAL_UPDATE, TIMER_INTERVAL_MS, nullptr);
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
+}
+
+
+HBRUSH CPageLinkSignal::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+{
+ HBRUSH hbr = CHMPropertyPage::OnCtlColor(pDC, pWnd, nCtlColor);
+
+ // TODO: 鍦ㄦ鏇存敼 DC 鐨勪换浣曠壒鎬�
+
+ // TODO: 濡傛灉榛樿鐨勪笉鏄墍闇�鐢荤瑪锛屽垯杩斿洖鍙︿竴涓敾绗�
+ return hbr;
+}
+
+
+void CPageLinkSignal::OnDestroy()
+{
+ CHMPropertyPage::OnDestroy();
+
+ // TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
+ for (int i = 0; i < 8; i++) {
+ for (int j = 0; j < 8; j++) {
+ if (m_pBtn[i][j] != nullptr) {
+ m_pBtn[i][j]->DestroyWindow();
+ delete m_pBtn[i][j];
+ m_pBtn[i][j] = nullptr;
+ }
+ }
+ }
+}
+
+
+void CPageLinkSignal::OnSize(UINT nType, int cx, int cy)
+{
+ CHMPropertyPage::OnSize(nType, cx, cy);
+
+ // TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
+}
+
+#define BTN_X 98
+#define BTN_Y 80
+#define BTN_WIDTH 36
+void CPageLinkSignal::CreateSignalButtons()
+{
+ int x = 100;
+ int y = 100;
+ int marginx = 32;
+ int marginy = 12;
+ for (int row = 0; row < 8; row++) {
+ y = BTN_Y + (BTN_WIDTH + marginy) * row;
+ for (int col = 0; col < 8; col++) {
+ x = BTN_X + (BTN_WIDTH + marginx) * col;
+ m_pBtn[row][col] = new CBlButton();
+ m_pBtn[row][col]->Create("", WS_VISIBLE, { x, y, x + 36, y + 36 }, this, 1000);
+ m_pBtn[row][col]->SetFaceColor(FACECOLOR_OFF);
+ m_pBtn[row][col]->SetFrameColor(RGB(28, 28, 28));
+ m_pBtn[row][col]->SetTextColor(RGB(238, 238, 238));
+ }
+ }
+
+ CWnd* pItem;
+ CRect rcItem;
+ int idx[] = { IDC_LABEL_PATH1, IDC_LABEL_PATH2, IDC_LABEL_PATH3, IDC_LABEL_PATH4, IDC_LABEL_PATH5,
+ IDC_LABEL_PATH6, IDC_LABEL_PATH7, IDC_LABEL_PATH8};
+ for (int i = 0; i < 8; i++) {
+ pItem = GetDlgItem(idx[i]);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(BTN_X - rcItem.Width() - 18,
+ BTN_Y + (36 - rcItem.Height()) / 2 + (BTN_WIDTH + marginy) * i,
+ rcItem.Width(), rcItem.Height());
+ }
+
+ int idy[] = { IDC_LABEL_NAME1, IDC_LABEL_NAME2, IDC_LABEL_NAME3, IDC_LABEL_NAME4, IDC_LABEL_NAME5,
+ IDC_LABEL_NAME6, IDC_LABEL_NAME7, IDC_LABEL_NAME8 };
+ for (int i = 0; i < 8; i++) {
+ pItem = GetDlgItem(idy[i]);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(BTN_X + (BTN_WIDTH + marginx) * i,
+ BTN_Y - 36,
+ rcItem.Width(), rcItem.Height());
+ }
+}
+
+void CPageLinkSignal::OnTimer(UINT_PTR nIDEvent)
+{
+ if (nIDEvent == TIMER_ID_SIGNAL_UPDATE) {
+ if (m_pEquipment) {
+ UpdateAllSignalStatesFromDevice();
+ }
+ }
+
+ CHMPropertyPage::OnTimer(nIDEvent);
+}
+
+void CPageLinkSignal::UpdateAllSignalStatesFromDevice()
+{
+ ASSERT(m_pEquipment);
+
+ for (int nRow = 0; nRow < 8; ++nRow) {
+ for (int nCol = 0; nCol < 8; ++nCol) {
+ BOOL bCurrentState = m_pEquipment->isLinkSignalOn(nRow, nCol);
+ UpdateSignalState(nRow, nCol, bCurrentState);
+ }
+ }
+}
+
+void CPageLinkSignal::UpdateSignalState(int nRow, int nCol, bool bNewState)
+{
+ if (!::IsWindow(m_pBtn[nRow][nCol]->GetSafeHwnd())) {
+ return;
+ }
+
+ bool bState = ::GetProp(m_pBtn[nRow][nCol]->GetSafeHwnd(), _T("State")) == (void*)1;
+ if (bState != bNewState) {
+ m_pBtn[nRow][nCol]->SetFaceColor(bNewState ? FACECOLOR_ON : FACECOLOR_OFF);
+ ::SetProp(m_pBtn[nRow][nCol]->GetSafeHwnd(), _T("State"), bNewState ? (void*)1 : (void*)0);
+ }
+}
+
+
diff --git a/SourceCode/Bond/Servo/CPageLinkSignal.h b/SourceCode/Bond/Servo/CPageLinkSignal.h
new file mode 100644
index 0000000..c671159
--- /dev/null
+++ b/SourceCode/Bond/Servo/CPageLinkSignal.h
@@ -0,0 +1,40 @@
+锘�#pragma once
+#include "CHMPropertyPage.h"
+#include "BlButton.h"
+
+
+// CPageLinkSignal 瀵硅瘽妗�
+
+class CPageLinkSignal : public CHMPropertyPage
+{
+ DECLARE_DYNAMIC(CPageLinkSignal)
+
+public:
+ CPageLinkSignal(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
+ virtual ~CPageLinkSignal();
+ void setEquipment(SERVO::CEquipment* pEquipment);
+ void CreateSignalButtons();
+ void UpdateAllSignalStatesFromDevice();
+ void UpdateSignalState(int nRow, int nCol, bool bNewState);
+
+
+private:
+ SERVO::CEquipment* m_pEquipment;
+ CBlButton* m_pBtn[8][8];
+
+// 瀵硅瘽妗嗘暟鎹�
+#ifdef AFX_DESIGN_TIME
+ enum { IDD = IDD_PAGE_LINK_SIGNAL };
+#endif
+
+protected:
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
+
+ DECLARE_MESSAGE_MAP()
+public:
+ virtual BOOL OnInitDialog();
+ afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+ afx_msg void OnDestroy();
+ afx_msg void OnSize(UINT nType, int cx, int cy);
+ afx_msg void OnTimer(UINT_PTR nIDEvent);
+};
diff --git a/SourceCode/Bond/Servo/Common.h b/SourceCode/Bond/Servo/Common.h
index fc13f87..a3296d6 100644
--- a/SourceCode/Bond/Servo/Common.h
+++ b/SourceCode/Bond/Servo/Common.h
@@ -243,6 +243,8 @@
#define STEP_PORT2_CASSETTE_TYPE_CHANGE _T("Port2CassetteTypeChange")
#define STEP_PORT3_CASSETTE_TYPE_CHANGE _T("Port3CassetteTypeChange")
#define STEP_PORT4_CASSETTE_TYPE_CHANGE _T("Port4CassetteTypeChange")
+#define STEP_EQ_PANEL_DATA_REPORT _T("EQPanelDataReport")
+#define STEP_EQ_FAC_DATA_REPORT _T("EQFacDataReport")
/* Step ID */
@@ -267,6 +269,7 @@
#define STEP_ID_VCR1_EVENT_REPORT 0x56A
#define STEP_ID_MASTER_RECIPE_LIST_REPORT 0x56B
#define STEP_ID_RECIPE_PARAMETER_REPORT 0x56C
+#define STEP_ID_FAC_DATA_REPORT 0x56D
#define STEP_ID_RECIVE_JOB_UPS1 0x580
#define STEP_ID_RECIVE_JOB_UPS2 0x581
#define STEP_ID_RECIVE_JOB_UPS3 0x582
@@ -315,6 +318,7 @@
#define STEP_ID_FETCHED_OUT_JOB_REPORT13 0x5BB
#define STEP_ID_FETCHED_OUT_JOB_REPORT14 0x5BC
#define STEP_ID_FETCHED_OUT_JOB_REPORT15 0x5BD
+#define STEP_ID_PANEL_DATA_REPORT 0x5D1
#define STEP_ID_IN_OP_CMD_REPLY 0x5F0
#define STEP_ID_DISPATCHING_MODE_CHANGE_REPLY 0x5F1
#define STEP_ID_PORT1_TYPE_CHANGE 0x600
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index 07190ea..b72754b 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 035ebfb..ec5ba3d 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -203,6 +203,7 @@
<ClInclude Include="CGlassPool.h" />
<ClInclude Include="ChangePasswordDlg.h" />
<ClInclude Include="CMyStatusbar.h" />
+ <ClInclude Include="CPageLinkSignal.h" />
<ClInclude Include="CRobotCmdContainerDlg.h" />
<ClInclude Include="CRobotCmdTestDlg.h" />
<ClInclude Include="CPagePortStatus.h" />
@@ -342,6 +343,7 @@
<ClCompile Include="CGlassPool.cpp" />
<ClCompile Include="ChangePasswordDlg.cpp" />
<ClCompile Include="CMyStatusbar.cpp" />
+ <ClCompile Include="CPageLinkSignal.cpp" />
<ClCompile Include="CRobotCmdContainerDlg.cpp" />
<ClCompile Include="CRobotCmdTestDlg.cpp" />
<ClCompile Include="CPagePortStatus.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index f853e77..0293739 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -159,6 +159,7 @@
<ClCompile Include="PageTransferLog.cpp" />
<ClCompile Include="ServoMemDC.cpp" />
<ClCompile Include="ChangePasswordDlg.cpp" />
+ <ClCompile Include="CPageLinkSignal.cpp" />
<ClCompile Include="LoginDlg.cpp" />
<ClCompile Include="SystemLogManagerDlg.cpp" />
<ClCompile Include="UserManagerDlg.cpp" />
@@ -330,6 +331,7 @@
<ClInclude Include="PageTransferLog.h" />
<ClInclude Include="ServoMemDC.h" />
<ClInclude Include="ChangePasswordDlg.h" />
+ <ClInclude Include="CPageLinkSignal.h" />
<ClInclude Include="LoginDlg.h" />
<ClInclude Include="SystemLogManagerDlg.h" />
<ClInclude Include="UserManagerDlg.h" />
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index 7cc59e5..6ddfdd1 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ
--
Gitblit v1.9.3