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 | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index 796971e..8c439f7 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -198,6 +198,35 @@
<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" />
@@ -421,6 +450,53 @@
<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" />
@@ -460,5 +536,8 @@
<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