From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/Servo.vcxproj | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index e776f64..a6f4ee0 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" />
@@ -319,15 +324,18 @@
<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" />
@@ -340,6 +348,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" />
@@ -442,6 +453,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