From 2f0684bf01209b9ddfdc53da44fb85f4db6db326 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 06 六月 2025 15:56:02 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/Servo.vcxproj |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 11eb375..6a9a993 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -200,10 +200,12 @@
   <ItemGroup>
     <ClInclude Include="CEquipmentPage3.h" />
     <ClInclude Include="CGlassPool.h" />
+    <ClInclude Include="CMyStatusbar.h" />
     <ClInclude Include="CRobotCmdContainerDlg.h" />
     <ClInclude Include="CRobotCmdTestDlg.h" />
     <ClInclude Include="CPagePortStatus.h" />
     <ClInclude Include="CPortStatusReport.h" />
+    <ClInclude Include="CRobotTaskDlg.h" />
     <ClInclude Include="GridControl\CellRange.h" />
     <ClInclude Include="GridControl\GridCell.h" />
     <ClInclude Include="GridControl\GridCellBase.h" />
@@ -218,6 +220,9 @@
     <ClInclude Include="GridControl\NewCellTypes\GridCellNumeric.h" />
     <ClInclude Include="GridControl\NewCellTypes\GridURLCell.h" />
     <ClInclude Include="GridControl\TitleTip.h" />
+    <ClInclude Include="CRobotTask.h" />
+    <ClInclude Include="CSlot.h" />
+    <ClInclude Include="HorizontalLine.h" />
     <ClInclude Include="JobSlotGrid.h" />
     <ClInclude Include="MsgDlg.h" />
     <ClInclude Include="PageRecipe.h" />
@@ -304,6 +309,7 @@
     <ClInclude Include="MapPosWnd.h" />
     <ClInclude Include="Model.h" />
     <ClInclude Include="PageRobotCmd.h" />
+    <ClInclude Include="PageTransferLog.h" />
     <ClInclude Include="PortConfigurationDlg.h" />
     <ClInclude Include="ProductionLogManager.h" />
     <ClInclude Include="Resource.h" />
@@ -313,20 +319,24 @@
     <ClInclude Include="ServoCommo.h" />
     <ClInclude Include="ServoDlg.h" />
     <ClInclude Include="ServoGraph.h" />
+    <ClInclude Include="ServoMemDC.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="TerminalDisplayDlg.h" />
     <ClInclude Include="ToolUnits.h" />
     <ClInclude Include="TransferManager.h" />
+    <ClInclude Include="TopToolbar.h" />
     <ClInclude Include="VerticalLine.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="CEquipmentPage3.cpp" />
     <ClCompile Include="CGlassPool.cpp" />
+    <ClCompile Include="CMyStatusbar.cpp" />
     <ClCompile Include="CRobotCmdContainerDlg.cpp" />
     <ClCompile Include="CRobotCmdTestDlg.cpp" />
     <ClCompile Include="CPagePortStatus.cpp" />
     <ClCompile Include="CPortStatusReport.cpp" />
+    <ClCompile Include="CRobotTaskDlg.cpp" />
     <ClCompile Include="GridControl\GridCell.cpp" />
     <ClCompile Include="GridControl\GridCellBase.cpp" />
     <ClCompile Include="GridControl\GridCellButton.cpp" />
@@ -339,6 +349,9 @@
     <ClCompile Include="GridControl\NewCellTypes\GridCellNumeric.cpp" />
     <ClCompile Include="GridControl\NewCellTypes\GridURLCell.cpp" />
     <ClCompile Include="GridControl\TitleTip.cpp" />
+    <ClCompile Include="CRobotTask.cpp" />
+    <ClCompile Include="CSlot.cpp" />
+    <ClCompile Include="HorizontalLine.cpp" />
     <ClCompile Include="JobSlotGrid.cpp" />
     <ClCompile Include="MsgDlg.cpp" />
     <ClCompile Include="PageRecipe.cpp" />
@@ -424,6 +437,7 @@
     <ClCompile Include="MapPosWnd.cpp" />
     <ClCompile Include="Model.cpp" />
     <ClCompile Include="PageRobotCmd.cpp" />
+    <ClCompile Include="PageTransferLog.cpp" />
     <ClCompile Include="PortConfigurationDlg.cpp" />
     <ClCompile Include="ProductionLogManager.cpp" />
     <ClCompile Include="SECSRuntimeManager.cpp" />
@@ -431,6 +445,7 @@
     <ClCompile Include="Servo.cpp" />
     <ClCompile Include="ServoDlg.cpp" />
     <ClCompile Include="ServoGraph.cpp" />
+    <ClCompile Include="ServoMemDC.cpp" />
     <ClCompile Include="stdafx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@@ -440,6 +455,7 @@
     <ClCompile Include="TerminalDisplayDlg.cpp" />
     <ClCompile Include="ToolUnits.cpp" />
     <ClCompile Include="TransferManager.cpp" />
+    <ClCompile Include="TopToolbar.cpp" />
     <ClCompile Include="VerticalLine.cpp" />
   </ItemGroup>
   <ItemGroup>

--
Gitblit v1.9.3