From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/Servo.vcxproj.filters | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 178 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index f853e77..8c439f7 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -159,6 +159,7 @@
<ClCompile Include="PageTransferLog.cpp" />
<ClCompile Include="ServoMemDC.cpp" />
<ClCompile Include="ChangePasswordDlg.cpp" />
+ <ClCompile Include="CPageLinkSignal.cpp" />
<ClCompile Include="LoginDlg.cpp" />
<ClCompile Include="SystemLogManagerDlg.cpp" />
<ClCompile Include="UserManagerDlg.cpp" />
@@ -166,6 +167,66 @@
<ClCompile Include="SystemLogManager.cpp" />
<ClCompile Include="UserManager.cpp" />
<ClCompile Include="InputDialog.cpp" />
+ <ClCompile Include="RecipeManager.cpp" />
+ <ClCompile Include="RecipeDeviceBindDlg.cpp" />
+ <ClCompile Include="CCustomCheckBox.cpp" />
+ <ClCompile Include="CCollectionEvent.cpp" />
+ <ClCompile Include="CReport.cpp" />
+ <ClCompile Include="CVariable.cpp" />
+ <ClCompile Include="CPageVarialbles.cpp" />
+ <ClCompile Include="CPageReport.cpp" />
+ <ClCompile Include="CPageCollectionEvent.cpp" />
+ <ClCompile Include="ProcessJob.cpp" />
+ <ClCompile Include="CControlJob.cpp" />
+ <ClCompile Include="CExpandableListCtrl.cpp" />
+ <ClCompile Include="CControlJobDlg.cpp" />
+ <ClCompile Include="CParam.cpp" />
+ <ClCompile Include="CPageGlassList.cpp" />
+ <ClCompile Include="GlassJson.cpp" />
+ <ClCompile Include="..\jsoncpp\lib_json\json_reader.cpp">
+ <Filter>JsonCpp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\jsoncpp\lib_json\json_value.cpp">
+ <Filter>JsonCpp</Filter>
+ </ClCompile>
+ <ClCompile Include="..\jsoncpp\lib_json\json_writer.cpp">
+ <Filter>JsonCpp</Filter>
+ </ClCompile>
+ <ClCompile Include="DeviceRecipeParamDlg.cpp" />
+ <ClCompile Include="CSVData.cpp" />
+ <ClCompile Include="CServoUtilsTool.cpp" />
+ <ClCompile Include="GlassLogDb.cpp" />
+ <ClCompile Include="sqlite3.c" />
+ <ClCompile Include="CProcessDataListDlg.cpp" />
+ <ClCompile Include="GroupLabel.cpp" />
+ <ClCompile Include="CControlJobManagerDlg.cpp" />
+ <ClCompile Include="CCjPage1.cpp" />
+ <ClCompile Include="CCjPage2.cpp" />
+ <ClCompile Include="CCjPage3.cpp" />
+ <ClCompile Include="CCjPageBase.cpp" />
+ <ClCompile Include="CCarrierSlotSelector.cpp" />
+ <ClCompile Include="CCarrierSlotGrid.cpp" />
+ <ClCompile Include="..\DAQBridge\buffer\BufferManager.cpp">
+ <Filter>DAQBridge</Filter>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\buffer\BufferRegistry.cpp">
+ <Filter>DAQBridge</Filter>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\buffer\SampleBuffer.cpp">
+ <Filter>DAQBridge</Filter>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\core\Collector.cpp">
+ <Filter>DAQBridge</Filter>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\core\Display.cpp">
+ <Filter>DAQBridge</Filter>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\net\SocketComm.cpp">
+ <Filter>DAQBridge</Filter>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\proto\ProtocolCodec.cpp">
+ <Filter>DAQBridge</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -330,6 +391,7 @@
<ClInclude Include="PageTransferLog.h" />
<ClInclude Include="ServoMemDC.h" />
<ClInclude Include="ChangePasswordDlg.h" />
+ <ClInclude Include="CPageLinkSignal.h" />
<ClInclude Include="LoginDlg.h" />
<ClInclude Include="SystemLogManagerDlg.h" />
<ClInclude Include="UserManagerDlg.h" />
@@ -337,6 +399,104 @@
<ClInclude Include="UserManager.h" />
<ClInclude Include="SystemLogManager.h" />
<ClInclude Include="InputDialog.h" />
+ <ClInclude Include="RecipeManager.h" />
+ <ClInclude Include="RecipeDeviceBindDlg.h" />
+ <ClInclude Include="CCustomCheckBox.h" />
+ <ClInclude Include="CCollectionEvent.h" />
+ <ClInclude Include="CReport.h" />
+ <ClInclude Include="CVariable.h" />
+ <ClInclude Include="CPageVarialbles.h" />
+ <ClInclude Include="CPageReport.h" />
+ <ClInclude Include="CPageCollectionEvent.h" />
+ <ClInclude Include="ProcessJob.h" />
+ <ClInclude Include="CControlJob.h" />
+ <ClInclude Include="SerializeUtil.h" />
+ <ClInclude Include="CExpandableListCtrl.h" />
+ <ClInclude Include="CControlJobDlg.h" />
+ <ClInclude Include="CParam.h" />
+ <ClInclude Include="CPageGlassList.h" />
+ <ClInclude Include="GlassJson.h" />
+ <ClInclude Include="..\jsoncpp\include\json\autolink.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\config.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\features.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\forwards.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\json.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\reader.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\value.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\include\json\writer.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h">
+ <Filter>JsonCpp</Filter>
+ </ClInclude>
+ <ClInclude Include="DeviceRecipeParamDlg.h" />
+ <ClInclude Include="CSVData.h" />
+ <ClInclude Include="CServoUtilsTool.h" />
+ <ClInclude Include="GlassLogDb.h" />
+ <ClInclude Include="sqlite3.h" />
+ <ClInclude Include="sqlite3ext.h" />
+ <ClInclude Include="CProcessDataListDlg.h" />
+ <ClInclude Include="GroupLabel.h" />
+ <ClInclude Include="CControlJobManagerDlg.h" />
+ <ClInclude Include="CCjPage1.h" />
+ <ClInclude Include="CCjPage2.h" />
+ <ClInclude Include="CCjPage3.h" />
+ <ClInclude Include="CCjPageBase.h" />
+ <ClInclude Include="CCarrierSlotSelector.h" />
+ <ClInclude Include="CCarrierSlotGrid.h" />
+ <ClInclude Include="..\DAQBridge\buffer\BufferManager.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\buffer\BufferRegistry.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\buffer\SampleBuffer.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\core\Collector.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\core\CommBase.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\core\ConnEvents.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\core\DataTypes.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\core\Display.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\net\FrameAssembler.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\net\SocketComm.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\proto\Protocol.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\proto\ProtocolCodec.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
+ <ClInclude Include="..\DAQBridge\DAQConfig.h">
+ <Filter>DAQBridge</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
@@ -347,6 +507,18 @@
<ItemGroup>
<None Include="packages.config" />
<None Include="res\Servo.rc2" />
+ <None Include="..\jsoncpp\lib_json\json_internalarray.inl">
+ <Filter>JsonCpp</Filter>
+ </None>
+ <None Include="..\jsoncpp\lib_json\json_internalmap.inl">
+ <Filter>JsonCpp</Filter>
+ </None>
+ <None Include="..\jsoncpp\lib_json\json_valueiterator.inl">
+ <Filter>JsonCpp</Filter>
+ </None>
+ <None Include="..\jsoncpp\lib_json\sconscript">
+ <Filter>JsonCpp</Filter>
+ </None>
</ItemGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
@@ -361,5 +533,11 @@
<Filter Include="GridControl\NewCellTypes">
<UniqueIdentifier>{52ebd40d-fb71-4a53-93ab-5b93670c706d}</UniqueIdentifier>
</Filter>
+ <Filter Include="JsonCpp">
+ <UniqueIdentifier>{a877af37-2f78-484f-b1bb-276edbbcd694}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="DAQBridge">
+ <UniqueIdentifier>{885738f6-3122-4bb9-8308-46b7f692fb13}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3