grpc_client/.idea/workspace.sync-conflict-20260326-143838-55JW2V4.xml

247 lines
17 KiB
XML
Raw Normal View History

2026-06-17 09:36:26 +08:00
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="14e52ab9-de95-493e-8d51-2bc74f57bef2" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/clients/base_client.py" beforeDir="false" afterPath="$PROJECT_DIR$/clients/base_client.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/clients/gui_camera_client..py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/clients/joint_states.csv" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/clients/press_client.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/biohead_command_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/biohead_command_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/biohead_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/biohead_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/biohead_service_pb2_grpc.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/biohead_service_pb2_grpc.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/camera_command_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/camera_command_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/camera_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/camera_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/common_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/common_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/dexhand_command_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/dexhand_command_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/dexhand_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/dexhand_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/hlc_command_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/hlc_command_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/hlc_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/hlc_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/humanoid_robot_command_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/humanoid_robot_command_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/humanoid_robot_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/humanoid_robot_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/humanoid_robot_service_pb2_grpc.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/humanoid_robot_service_pb2_grpc.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/microphone_command_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/microphone_command_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/microphone_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/microphone_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/speaker_command_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/speaker_command_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/speaker_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/speaker_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/system_command_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/system_command_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/system_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/system_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/system_service_pb2_grpc.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/system_service_pb2_grpc.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/api/test_service_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/api/test_service_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/msgs/can_card_parameter_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/msgs/can_card_parameter_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/msgs/canopen_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/msgs/canopen_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/msgs/error_code_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/msgs/error_code_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/msgs/geometry_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/msgs/geometry_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/msgs/motor_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/msgs/motor_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generated/cmvr/msgs/robot_detail_pb2.py" beforeDir="false" afterPath="$PROJECT_DIR$/generated/cmvr/msgs/robot_detail_pb2.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/biohead_command.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/biohead_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/camera_command.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/camera_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/common.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/dexhand_command.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/dexhand_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/hlc_command.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/hlc_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/humanoid_robot_command.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/humanoid_robot_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/microphone_command.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/microphone_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/speaker_command.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/speaker_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/system_command.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/system_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/api/test_service.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/msgs/can_card_parameter.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/msgs/canopen.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/msgs/error_code.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/msgs/geometry.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/msgs/motor.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/protos/cmvr/msgs/robot_detail.proto" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/requirements.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/apriltags_border_20x15cm_A4.pdf" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/generate_apriltag_single.py" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/generate_apriltag_single.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/generate_apriltags_border.py" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/generate_apriltags_border.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ui/app.py" beforeDir="false" afterPath="$PROJECT_DIR$/ui/app.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="EmbeddingIndexingInfo">
<option name="cachedIndexableFilesCount" value="390" />
<option name="fileBasedEmbeddingIndicesEnabled" value="true" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Python Script" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="McpProjectServerCommands">
<commands />
<urls />
</component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 3
}</component>
<component name="ProjectId" id="3B49fOihNkRbSSSqQJdMjIqYFFv" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"Python.app.executor": "Run",
"Python.generate_apriltag_batch.executor": "Run",
"Python.generate_apriltags_border.executor": "Run",
"Python.gui_camera_client..executor": "Run",
"RunOnceActivity.MCP Project settings loaded": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
"RunOnceActivity.git.unshallow": "true",
"com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
"git-widget-placeholder": "master",
"junie.onboarding.icon.badge.shown": "true",
"last_opened_file_path": "D:/cmvr/0-worksapce/grpc_client",
"settings.editor.selected.configurable": "http.proxy",
"to.speed.mode.migration.done": "true"
}
}]]></component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\cmvr\0-worksapce\grpc_client" />
</key>
</component>
<component name="RunManager" selected="Python.app">
<configuration name="app" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="grpc_client" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/ui" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="RUN_TOOL" value="" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/ui/app.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="generate_apriltag_batch" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="grpc_client" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/scripts" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="RUN_TOOL" value="" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/scripts/generate_apriltag_batch.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="generate_apriltags_border" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="grpc_client" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/scripts" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="RUN_TOOL" value="" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/scripts/generate_apriltags_border.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="gui_camera_client." type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="grpc_client" />
<option name="ENV_FILES" value="" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/clients" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="RUN_TOOL" value="" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/clients/gui_camera_client..py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.app" />
<item itemvalue="Python.generate_apriltags_border" />
<item itemvalue="Python.generate_apriltag_batch" />
<item itemvalue="Python.gui_camera_client." />
</list>
</recent_temporary>
</component>
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-python-sdk-4762d8aabb82-6d6dccd035ac-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-253.30387.173" />
</set>
</attachedChunks>
</component>
<component name="SvnConfiguration">
<configuration>C:\Users\lgv\AppData\Roaming\Subversion</configuration>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="14e52ab9-de95-493e-8d51-2bc74f57bef2" name="Changes" comment="" />
<created>1773737578904</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1773737578904</updated>
</task>
<servers />
</component>
</project>