diff --git a/MDK-ARM/.vscode/c_cpp_properties.json b/MDK-ARM/.vscode/c_cpp_properties.json
index 120b12d..2492d5b 100644
--- a/MDK-ARM/.vscode/c_cpp_properties.json
+++ b/MDK-ARM/.vscode/c_cpp_properties.json
@@ -3,26 +3,26 @@
         {
             "name": "R1-shooter",
             "includePath": [
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Core\\Inc",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Drivers\\STM32F4xx_HAL_Driver\\Inc",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Drivers\\STM32F4xx_HAL_Driver\\Inc\\Legacy",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source\\include",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source\\CMSIS_RTOS_V2",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source\\portable\\RVDS\\ARM_CM4F",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Drivers\\CMSIS\\Device\\ST\\STM32F4xx\\Include",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Drivers\\CMSIS\\Include",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\User\\bsp",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\User\\module",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\User\\task",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\User\\lib",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\User\\device",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Core\\Inc",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Drivers\\STM32F4xx_HAL_Driver\\Inc",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Drivers\\STM32F4xx_HAL_Driver\\Inc\\Legacy",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source\\include",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source\\CMSIS_RTOS_V2",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source\\portable\\RVDS\\ARM_CM4F",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Drivers\\CMSIS\\Device\\ST\\STM32F4xx\\Include",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Drivers\\CMSIS\\Include",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\User\\bsp",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\User\\module",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\User\\task",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\User\\lib",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\User\\device",
                 "D:\\keil\\ARM\\ARMCC\\include",
                 "D:\\keil\\ARM\\ARMCC\\include\\rw",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\MDK-ARM",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Core\\Src",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Drivers\\STM32F4xx_HAL_Driver\\Src",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source",
-                "d:\\Desktop\\r1\\r1_upper\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source\\portable\\MemMang"
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\MDK-ARM",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Core\\Src",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Drivers\\STM32F4xx_HAL_Driver\\Src",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source",
+                "d:\\Desktop\\r1\\r1_upper - xiaomi\\r1upper-1\\Middlewares\\Third_Party\\FreeRTOS\\Source\\portable\\MemMang"
             ],
             "defines": [
                 "USE_HAL_DRIVER",
diff --git a/MDK-ARM/.vscode/keil-assistant.log b/MDK-ARM/.vscode/keil-assistant.log
index 8fe8493..5fad5b6 100644
--- a/MDK-ARM/.vscode/keil-assistant.log
+++ b/MDK-ARM/.vscode/keil-assistant.log
@@ -94,9 +94,13 @@
 
 [info] Log at : 2025/5/21|19:21:48|GMT+0800
 
+<<<<<<< HEAD
 [info] Log at : 2025/5/22|18:05:58|GMT+0800
 
 [info] Log at : 2025/5/23|19:18:37|GMT+0800
 
 [info] Log at : 2025/5/23|19:32:28|GMT+0800
+=======
+[info] Log at : 2025/5/22|16:11:31|GMT+0800
+>>>>>>> 8fc2f50677ecabc32b37eac7a7df89d916fefef0