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.filters | 129 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 127 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 645cae7..f99065e 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -99,8 +99,64 @@
<ClCompile Include="CRecipeList.cpp" />
<ClCompile Include="CArm.cpp" />
<ClCompile Include="CArmTray.cpp" />
- <ClCompile Include="ProductionLogDlg.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
+ <ClCompile Include="PageRecipe.cpp" />
+ <ClCompile Include="CDoubleGlass.cpp" />
+ <ClCompile Include="CProcessData.cpp" />
+ <ClCompile Include="CGlassPool.cpp" />
+ <ClCompile Include="CEquipmentPage3.cpp" />
+ <ClCompile Include="PageRobotCmd.cpp" />
+ <ClCompile Include="CRobotCmdContainerDlg.cpp" />
+ <ClCompile Include="CRobotCmdTestDlg.cpp" />
+ <ClCompile Include="CPortStatusReport.cpp" />
+ <ClCompile Include="MsgDlg.cpp" />
+ <ClCompile Include="CPagePortStatus.cpp" />
+ <ClCompile Include="JobSlotGrid.cpp" />
+ <ClCompile Include="GridControl\GridCell.cpp">
+ <Filter>GridControl</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\GridCellBase.cpp">
+ <Filter>GridControl</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\GridCellButton.cpp">
+ <Filter>GridControl</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\GridCtrl.cpp">
+ <Filter>GridControl</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\GridDropTarget.cpp">
+ <Filter>GridControl</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\GridInPlaceEdit.cpp">
+ <Filter>GridControl</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\TitleTip.cpp">
+ <Filter>GridControl</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\NewCellTypes\GridCellCheck.cpp">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\NewCellTypes\GridCellCombo.cpp">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\NewCellTypes\GridCellDateTime.cpp">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\NewCellTypes\GridCellNumeric.cpp">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClCompile>
+ <ClCompile Include="GridControl\NewCellTypes\GridURLCell.cpp">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClCompile>
+ <ClCompile Include="PortConfigurationDlg.cpp" />
+ <ClCompile Include="TransferManager.cpp" />
+ <ClCompile Include="TopToolbar.cpp" />
+ <ClCompile Include="HorizontalLine.cpp" />
+ <ClCompile Include="CMyStatusbar.cpp" />
+ <ClCompile Include="CRobotTask.cpp" />
+ <ClCompile Include="CSlot.cpp" />
+ <ClCompile Include="CRobotTaskDlg.cpp" />
+ <ClCompile Include="PageTransferLog.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -198,8 +254,71 @@
<ClInclude Include="CRecipeList.h" />
<ClInclude Include="CArm.h" />
<ClInclude Include="CArmTray.h" />
- <ClInclude Include="ProductionLogDlg.h" />
<ClInclude Include="ProductionLogManager.h" />
+ <ClInclude Include="PageRecipe.h" />
+ <ClInclude Include="CDoubleGlass.h" />
+ <ClInclude Include="CProcessData.h" />
+ <ClInclude Include="CGlassPool.h" />
+ <ClInclude Include="CEquipmentPage3.h" />
+ <ClInclude Include="PageRobotCmd.h" />
+ <ClInclude Include="CRobotCmdContainerDlg.h" />
+ <ClInclude Include="CRobotCmdTestDlg.h" />
+ <ClInclude Include="CPortStatusReport.h" />
+ <ClInclude Include="MsgDlg.h" />
+ <ClInclude Include="CPagePortStatus.h" />
+ <ClInclude Include="ServoCommo.h" />
+ <ClInclude Include="JobSlotGrid.h" />
+ <ClInclude Include="GridControl\CellRange.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\GridCell.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\GridCellBase.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\GridCellButton.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\GridCtrl.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\GridDropTarget.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\GridInPlaceEdit.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\GridMemDC.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\TitleTip.h">
+ <Filter>GridControl</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\NewCellTypes\GridCellCheck.h">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\NewCellTypes\GridCellCombo.h">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\NewCellTypes\GridCellDateTime.h">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\NewCellTypes\GridCellNumeric.h">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClInclude>
+ <ClInclude Include="GridControl\NewCellTypes\GridURLCell.h">
+ <Filter>GridControl\NewCellTypes</Filter>
+ </ClInclude>
+ <ClInclude Include="PortConfigurationDlg.h" />
+ <ClInclude Include="TransferManager.h" />
+ <ClInclude Include="TopToolbar.h" />
+ <ClInclude Include="HorizontalLine.h" />
+ <ClInclude Include="CMyStatusbar.h" />
+ <ClInclude Include="CRobotTask.h" />
+ <ClInclude Include="CSlot.h" />
+ <ClInclude Include="CRobotTaskDlg.h" />
+ <ClInclude Include="PageTransferLog.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
@@ -218,5 +337,11 @@
<Filter Include="CCLinkPerformance">
<UniqueIdentifier>{77338295-9841-4706-8816-a958b1b5c465}</UniqueIdentifier>
</Filter>
+ <Filter Include="GridControl">
+ <UniqueIdentifier>{1206b229-6054-40f2-8d8a-5848582a3896}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="GridControl\NewCellTypes">
+ <UniqueIdentifier>{52ebd40d-fb71-4a53-93ab-5b93670c706d}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3