From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Servo.vcxproj.filters | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 8c439f7..09bb6e1 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -174,6 +174,7 @@
<ClCompile Include="CReport.cpp" />
<ClCompile Include="CVariable.cpp" />
<ClCompile Include="CPageVarialbles.cpp" />
+ <ClCompile Include="CPageDataVarialbles.cpp" />
<ClCompile Include="CPageReport.cpp" />
<ClCompile Include="CPageCollectionEvent.cpp" />
<ClCompile Include="ProcessJob.cpp" />
@@ -227,6 +228,23 @@
<ClCompile Include="..\DAQBridge\proto\ProtocolCodec.cpp">
<Filter>DAQBridge</Filter>
</ClCompile>
+ <ClCompile Include="ClientListDlg.cpp" />
+ <ClCompile Include="LoginDlg2.cpp" />
+ <ClCompile Include="CUserManager2.cpp" />
+ <ClCompile Include="CUserManager2Dlg.cpp" />
+ <ClCompile Include="CUserEdit2Dlg.cpp" />
+ <ClCompile Include="CUserXLogDlg.cpp" />
+ <ClCompile Include="CVariableEditDlg2.cpp" />
+ <ClCompile Include="CEventEditDlg.cpp" />
+ <ClCompile Include="CReportEditDlg.cpp" />
+ <ClCompile Include="ConfigurationProduction.cpp" />
+ <ClCompile Include="CPanelProduction.cpp" />
+ <ClCompile Include="ProductionStats.cpp" />
+ <ClCompile Include="AccordionWnd.cpp" />
+ <ClCompile Include="CPageProdOverview.cpp" />
+ <ClCompile Include="HmLabel.cpp" />
+ <ClCompile Include="CPageCtrlState.cpp" />
+ <ClCompile Include="AlarmPopupDlg.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -248,6 +266,7 @@
<ClInclude Include="stdafx.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="TerminalDisplayDlg.h" />
+ <ClInclude Include="ProductionStats.h" />
<ClInclude Include="SECSRuntimeManager.h" />
<ClInclude Include="CCLinkPerformance\CCLinkIEControl.h">
<Filter>CCLinkPerformance</Filter>
@@ -406,6 +425,7 @@
<ClInclude Include="CReport.h" />
<ClInclude Include="CVariable.h" />
<ClInclude Include="CPageVarialbles.h" />
+ <ClInclude Include="CPageDataVarialbles.h" />
<ClInclude Include="CPageReport.h" />
<ClInclude Include="CPageCollectionEvent.h" />
<ClInclude Include="ProcessJob.h" />
@@ -497,6 +517,21 @@
<ClInclude Include="..\DAQBridge\DAQConfig.h">
<Filter>DAQBridge</Filter>
</ClInclude>
+ <ClInclude Include="ClientListDlg.h" />
+ <ClInclude Include="LoginDlg2.h" />
+ <ClInclude Include="CUserManager2.h" />
+ <ClInclude Include="CUserManager2Dlg.h" />
+ <ClInclude Include="CUserEdit2Dlg.h" />
+ <ClInclude Include="CUserXLogDlg.h" />
+ <ClInclude Include="CVariableEditDlg2.h" />
+ <ClInclude Include="CEventEditDlg.h" />
+ <ClInclude Include="CReportEditDlg.h" />
+ <ClInclude Include="CPanelProduction.h" />
+ <ClInclude Include="AccordionWnd.h" />
+ <ClInclude Include="CPageProdOverview.h" />
+ <ClInclude Include="HmLabel.h" />
+ <ClInclude Include="CPageCtrlState.h" />
+ <ClInclude Include="AlarmPopupDlg.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
@@ -540,4 +575,4 @@
<UniqueIdentifier>{885738f6-3122-4bb9-8308-46b7f692fb13}</UniqueIdentifier>
</Filter>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
--
Gitblit v1.9.3