From 2d69213b1b41b5b039e5dc6f6b7c55d53fd03037 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 09:34:04 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/Servo.vcxproj.filters | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index df691ac..645cae7 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -14,7 +14,7 @@
<ClCompile Include="HsmsAction.cpp" />
<ClCompile Include="HsmsPassive.cpp" />
<ClCompile Include="Log.cpp" />
- <ClCompile Include="LogDlg.cpp" />
+ <ClCompile Include="PageLog.cpp" />
<ClCompile Include="LogEdit.cpp" />
<ClCompile Include="Model.cpp" />
<ClCompile Include="SecsTestDlg.cpp" />
@@ -40,7 +40,7 @@
<ClCompile Include="CEqModeStep.cpp" />
<ClCompile Include="CEqStatusStep.cpp" />
<ClCompile Include="CEqAlarmStep.cpp" />
- <ClCompile Include="AlarmDlg.cpp" />
+ <ClCompile Include="PageAlarm.cpp" />
<ClCompile Include="CEqProcessStep.cpp" />
<ClCompile Include="CAttribute.cpp" />
<ClCompile Include="CAttributeVector.cpp" />
@@ -97,6 +97,8 @@
<ClCompile Include="CEqReadStep.cpp" />
<ClCompile Include="CRecipesManager.cpp" />
<ClCompile Include="CRecipeList.cpp" />
+ <ClCompile Include="CArm.cpp" />
+ <ClCompile Include="CArmTray.cpp" />
<ClCompile Include="ProductionLogDlg.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
</ItemGroup>
@@ -109,7 +111,7 @@
<ClInclude Include="HsmsAction.h" />
<ClInclude Include="HsmsPassive.h" />
<ClInclude Include="Log.h" />
- <ClInclude Include="LogDlg.h" />
+ <ClInclude Include="PageLog.h" />
<ClInclude Include="LogEdit.h" />
<ClInclude Include="Model.h" />
<ClInclude Include="Resource.h" />
@@ -137,7 +139,7 @@
<ClInclude Include="CEqModeStep.h" />
<ClInclude Include="CEqStatusStep.h" />
<ClInclude Include="CEqAlarmStep.h" />
- <ClInclude Include="AlarmDlg.h" />
+ <ClInclude Include="PageAlarm.h" />
<ClInclude Include="CEqProcessStep.h" />
<ClInclude Include="CAttribute.h" />
<ClInclude Include="CAttributeVector.h" />
@@ -194,6 +196,8 @@
<ClInclude Include="CEqReadStep.h" />
<ClInclude Include="CRecipesManager.h" />
<ClInclude Include="CRecipeList.h" />
+ <ClInclude Include="CArm.h" />
+ <ClInclude Include="CArmTray.h" />
<ClInclude Include="ProductionLogDlg.h" />
<ClInclude Include="ProductionLogManager.h" />
</ItemGroup>
--
Gitblit v1.9.3