Merge branch 'liuyang'

LAPTOP-SNT8I5JK\Boounion

2025-09-08 a056810ab4c5fa63777f6fdddfeb190bbd9a6f54

 SourceCode/Bond/Servo/Servo.vcxproj.filters

@@ -150,6 +150,50 @@
    </ClCompile>
    <ClCompile Include="PortConfigurationDlg.cpp" />
    <ClCompile Include="TransferManager.cpp" />
    <ClCompile Include="TopToolbar.cpp" />
    <ClCompile Include="HorizontalLine.cpp" />
    <ClCompile Include="CMyStatusbar.cpp" />
    <ClCompile Include="CRobotTask.cpp" />
    <ClCompile Include="CSlot.cpp" />
    <ClCompile Include="CRobotTaskDlg.cpp" />
    <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" />
    <ClCompile Include="CBaseDlg.cpp" />
    <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" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="AlarmManager.h" />
@@ -305,6 +349,69 @@
    </ClInclude>
    <ClInclude Include="PortConfigurationDlg.h" />
    <ClInclude Include="TransferManager.h" />
    <ClInclude Include="TopToolbar.h" />
    <ClInclude Include="HorizontalLine.h" />
    <ClInclude Include="CMyStatusbar.h" />
    <ClInclude Include="CRobotTask.h" />
    <ClInclude Include="CSlot.h" />
    <ClInclude Include="CRobotTaskDlg.h" />
    <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" />
    <ClInclude Include="CBaseDlg.h" />
    <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" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Servo.rc" />
@@ -315,6 +422,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" />
@@ -329,5 +448,8 @@
    <Filter Include="GridControl\NewCellTypes">
      <UniqueIdentifier>{52ebd40d-fb71-4a53-93ab-5b93670c706d}</UniqueIdentifier>
    </Filter>
    <Filter Include="JsonCpp">
      <UniqueIdentifier>{a877af37-2f78-484f-b1bb-276edbbcd694}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
</Project>