From f5c4a7f3bce165fe2c8c6d934f0f49a363a2ea60 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期五, 15 十一月 2024 09:19:31 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/BondEq/BondEq.vcxproj | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEq.vcxproj b/SourceCode/Bond/BondEq/BondEq.vcxproj
index 9b0e384..b90ce2e 100644
--- a/SourceCode/Bond/BondEq/BondEq.vcxproj
+++ b/SourceCode/Bond/BondEq/BondEq.vcxproj
@@ -190,7 +190,10 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="CPLC.h" />
<ClInclude Include="AccordionWnd.h" />
+ <ClInclude Include="Alarm.h" />
+ <ClInclude Include="AlarmMonitor.h" />
<ClInclude Include="ApredTreeCtrl.h" />
<ClInclude Include="AxisSettingsDlg.h" />
<ClInclude Include="BaseSetPage.h" />
@@ -198,6 +201,12 @@
<ClInclude Include="BondEq.h" />
<ClInclude Include="BondEqDlg.h" />
<ClInclude Include="CBaseView.h" />
+ <ClInclude Include="CBonder.h" />
+ <ClInclude Include="CDataMonitor1.h" />
+ <ClInclude Include="Component.h" />
+ <ClInclude Include="Context.h" />
+ <ClInclude Include="CPanel.h" />
+ <ClInclude Include="CParam.h" />
<ClInclude Include="CRemoteEqUnitView.h" />
<ClInclude Include="CRemoteEqView.h" />
<ClInclude Include="CHomeDialog.h" />
@@ -208,15 +217,23 @@
<ClInclude Include="Configuration.h" />
<ClInclude Include="CPanelProject.h" />
<ClInclude Include="DBManager\UserManager.h" />
+ <ClInclude Include="EQState.h" />
+ <ClInclude Include="EQStateMonitor.h" />
<ClInclude Include="HmTab.h" />
<ClInclude Include="HmVerticalTab.h" />
<ClInclude Include="HorizontalLine.h" />
+ <ClInclude Include="Intent.h" />
+ <ClInclude Include="LoadMonitor.h" />
<ClInclude Include="Log.h" />
<ClInclude Include="LogEdit.h" />
+ <ClInclude Include="McBool.h" />
+ <ClInclude Include="McInt.h" />
+ <ClInclude Include="McItem.h" />
+ <ClInclude Include="McString.h" />
<ClInclude Include="Model.h" />
<ClInclude Include="CPageAlarm.h" />
+ <ClInclude Include="Recipe.h" />
<ClInclude Include="Resource.h" />
- <ClInclude Include="Bonder.h" />
<ClInclude Include="SetPage1.h" />
<ClInclude Include="SetPage2.h" />
<ClInclude Include="SettingsDlg.h" />
@@ -229,7 +246,10 @@
<ClInclude Include="View\LoginDlg.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="CPLC.cpp" />
<ClCompile Include="AccordionWnd.cpp" />
+ <ClCompile Include="Alarm.cpp" />
+ <ClCompile Include="AlarmMonitor.cpp" />
<ClCompile Include="ApredTreeCtrl.cpp" />
<ClCompile Include="AxisSettingsDlg.cpp" />
<ClCompile Include="BaseSetPage.cpp" />
@@ -237,6 +257,12 @@
<ClCompile Include="BondEq.cpp" />
<ClCompile Include="BondEqDlg.cpp" />
<ClCompile Include="CBaseView.cpp" />
+ <ClCompile Include="CBonder.cpp" />
+ <ClCompile Include="CDataMonitor1.cpp" />
+ <ClCompile Include="Component.cpp" />
+ <ClCompile Include="Context.cpp" />
+ <ClCompile Include="CPanel.cpp" />
+ <ClCompile Include="CParam.cpp" />
<ClCompile Include="CRemoteEqUnitView.cpp" />
<ClCompile Include="CRemoteEqView.cpp" />
<ClCompile Include="CHomeDialog.cpp" />
@@ -246,14 +272,22 @@
<ClCompile Include="Configuration.cpp" />
<ClCompile Include="CPanelProject.cpp" />
<ClCompile Include="DBManager\UserManager.cpp" />
+ <ClCompile Include="EQState.cpp" />
+ <ClCompile Include="EQStateMonitor.cpp" />
<ClCompile Include="HmTab.cpp" />
<ClCompile Include="HmVerticalTab.cpp" />
<ClCompile Include="HorizontalLine.cpp" />
+ <ClCompile Include="Intent.cpp" />
+ <ClCompile Include="LoadMonitor.cpp" />
<ClCompile Include="Log.cpp" />
<ClCompile Include="LogEdit.cpp" />
+ <ClCompile Include="McBool.cpp" />
+ <ClCompile Include="McInt.cpp" />
+ <ClCompile Include="McItem.cpp" />
+ <ClCompile Include="McString.cpp" />
<ClCompile Include="Model.cpp" />
<ClCompile Include="CPageAlarm.cpp" />
- <ClCompile Include="Bonder.cpp" />
+ <ClCompile Include="Recipe.cpp" />
<ClCompile Include="SetPage1.cpp" />
<ClCompile Include="SetPage2.cpp" />
<ClCompile Include="SettingsDlg.cpp" />
--
Gitblit v1.9.3