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 |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 5b150fd..2e09825 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -200,6 +200,19 @@
     <Text Include="ReadMe.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\DAQBridge\buffer\BufferManager.h" />
+    <ClInclude Include="..\DAQBridge\buffer\BufferRegistry.h" />
+    <ClInclude Include="..\DAQBridge\buffer\SampleBuffer.h" />
+    <ClInclude Include="..\DAQBridge\core\Collector.h" />
+    <ClInclude Include="..\DAQBridge\core\CommBase.h" />
+    <ClInclude Include="..\DAQBridge\core\ConnEvents.h" />
+    <ClInclude Include="..\DAQBridge\core\DataTypes.h" />
+    <ClInclude Include="..\DAQBridge\core\Display.h" />
+    <ClInclude Include="..\DAQBridge\DAQConfig.h" />
+    <ClInclude Include="..\DAQBridge\net\FrameAssembler.h" />
+    <ClInclude Include="..\DAQBridge\net\SocketComm.h" />
+    <ClInclude Include="..\DAQBridge\proto\Protocol.h" />
+    <ClInclude Include="..\DAQBridge\proto\ProtocolCodec.h" />
     <ClInclude Include="..\jsoncpp\include\json\autolink.h" />
     <ClInclude Include="..\jsoncpp\include\json\config.h" />
     <ClInclude Include="..\jsoncpp\include\json\features.h" />
@@ -210,6 +223,11 @@
     <ClInclude Include="..\jsoncpp\include\json\writer.h" />
     <ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h" />
     <ClInclude Include="CBaseDlg.h" />
+    <ClInclude Include="CCarrierSlotGrid.h" />
+    <ClInclude Include="CCarrierSlotSelector.h" />
+    <ClInclude Include="CCjPage2.h" />
+    <ClInclude Include="CCjPage3.h" />
+    <ClInclude Include="CCjPageBase.h" />
     <ClInclude Include="CControlJob.h" />
     <ClInclude Include="CControlJobDlg.h" />
     <ClInclude Include="CControlJobManagerDlg.h" />
@@ -219,6 +237,7 @@
     <ClInclude Include="CExpandableListCtrl.h" />
     <ClInclude Include="CGlassPool.h" />
     <ClInclude Include="ChangePasswordDlg.h" />
+    <ClInclude Include="ClientListDlg.h" />
     <ClInclude Include="CMyStatusbar.h" />
     <ClInclude Include="CPageCollectionEvent.h" />
     <ClInclude Include="CPageGlassList.h" />
@@ -376,6 +395,34 @@
     <ClInclude Include="VerticalLine.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\DAQBridge\buffer\BufferManager.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\buffer\BufferRegistry.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\buffer\SampleBuffer.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\core\Collector.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\core\Display.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\net\SocketComm.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\DAQBridge\proto\ProtocolCodec.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\jsoncpp\lib_json\json_reader.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
@@ -389,6 +436,11 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="CBaseDlg.cpp" />
+    <ClCompile Include="CCarrierSlotGrid.cpp" />
+    <ClCompile Include="CCarrierSlotSelector.cpp" />
+    <ClCompile Include="CCjPage2.cpp" />
+    <ClCompile Include="CCjPage3.cpp" />
+    <ClCompile Include="CCjPageBase.cpp" />
     <ClCompile Include="CControlJob.cpp" />
     <ClCompile Include="CControlJobDlg.cpp" />
     <ClCompile Include="CControlJobManagerDlg.cpp" />
@@ -398,6 +450,7 @@
     <ClCompile Include="CExpandableListCtrl.cpp" />
     <ClCompile Include="CGlassPool.cpp" />
     <ClCompile Include="ChangePasswordDlg.cpp" />
+    <ClCompile Include="ClientListDlg.cpp" />
     <ClCompile Include="CMyStatusbar.cpp" />
     <ClCompile Include="CPageCollectionEvent.cpp" />
     <ClCompile Include="CPageGlassList.cpp" />

--
Gitblit v1.9.3