更新?

This commit is contained in:
ws 2025-06-30 23:55:15 +08:00
parent 94eadcfa16
commit 512c223748
3 changed files with 44 additions and 18 deletions

20
.vscode/c_cpp_properties.json vendored Normal file
View File

@ -0,0 +1,20 @@
{
"configurations": [
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/**"
],
"defines": [
"_DEBUG",
"UNICODE",
"_UNICODE"
],
"compilerPath": "D:\\mingw\\MinGW\\bin\\gcc.exe",
"cStandard": "c17",
"cppStandard": "gnu++17",
"intelliSenseMode": "windows-gcc-x64"
}
],
"version": 4
}

View File

@ -3,26 +3,26 @@
{ {
"name": "R1", "name": "R1",
"includePath": [ "includePath": [
"d:\\Desktop\\r1\\运球\\Core\\Inc", "d:\\Desktop\\yunqiu\\R1_up\\Core\\Inc",
"d:\\Desktop\\r1\\运球\\Drivers\\STM32F4xx_HAL_Driver\\Inc", "d:\\Desktop\\yunqiu\\R1_up\\Drivers\\STM32F4xx_HAL_Driver\\Inc",
"d:\\Desktop\\r1\\运球\\Drivers\\STM32F4xx_HAL_Driver\\Inc\\Legacy", "d:\\Desktop\\yunqiu\\R1_up\\Drivers\\STM32F4xx_HAL_Driver\\Inc\\Legacy",
"d:\\Desktop\\r1\\运球\\Middlewares\\Third_Party\\FreeRTOS\\Source\\include", "d:\\Desktop\\yunqiu\\R1_up\\Middlewares\\Third_Party\\FreeRTOS\\Source\\include",
"d:\\Desktop\\r1\\运球\\Middlewares\\Third_Party\\FreeRTOS\\Source\\CMSIS_RTOS_V2", "d:\\Desktop\\yunqiu\\R1_up\\Middlewares\\Third_Party\\FreeRTOS\\Source\\CMSIS_RTOS_V2",
"d:\\Desktop\\r1\\运球\\Middlewares\\Third_Party\\FreeRTOS\\Source\\portable\\RVDS\\ARM_CM4F", "d:\\Desktop\\yunqiu\\R1_up\\Middlewares\\Third_Party\\FreeRTOS\\Source\\portable\\RVDS\\ARM_CM4F",
"d:\\Desktop\\r1\\运球\\Drivers\\CMSIS\\Device\\ST\\STM32F4xx\\Include", "d:\\Desktop\\yunqiu\\R1_up\\Drivers\\CMSIS\\Device\\ST\\STM32F4xx\\Include",
"d:\\Desktop\\r1\\运球\\Drivers\\CMSIS\\Include", "d:\\Desktop\\yunqiu\\R1_up\\Drivers\\CMSIS\\Include",
"d:\\Desktop\\r1\\运球\\User\\bsp", "d:\\Desktop\\yunqiu\\R1_up\\User\\bsp",
"d:\\Desktop\\r1\\运球\\User\\module", "d:\\Desktop\\yunqiu\\R1_up\\User\\module",
"d:\\Desktop\\r1\\运球\\User\\task", "d:\\Desktop\\yunqiu\\R1_up\\User\\task",
"d:\\Desktop\\r1\\运球\\User\\lib", "d:\\Desktop\\yunqiu\\R1_up\\User\\lib",
"d:\\Desktop\\r1\\运球\\User\\device", "d:\\Desktop\\yunqiu\\R1_up\\User\\device",
"D:\\keil\\ARM\\ARMCC\\include", "D:\\keil\\ARM\\ARMCC\\include",
"D:\\keil\\ARM\\ARMCC\\include\\rw", "D:\\keil\\ARM\\ARMCC\\include\\rw",
"d:\\Desktop\\r1\\运球\\MDK-ARM", "d:\\Desktop\\yunqiu\\R1_up\\MDK-ARM",
"d:\\Desktop\\r1\\运球\\Core\\Src", "d:\\Desktop\\yunqiu\\R1_up\\Core\\Src",
"d:\\Desktop\\r1\\运球\\Drivers\\STM32F4xx_HAL_Driver\\Src", "d:\\Desktop\\yunqiu\\R1_up\\Drivers\\STM32F4xx_HAL_Driver\\Src",
"d:\\Desktop\\r1\\运球\\Middlewares\\Third_Party\\FreeRTOS\\Source", "d:\\Desktop\\yunqiu\\R1_up\\Middlewares\\Third_Party\\FreeRTOS\\Source",
"d:\\Desktop\\r1\\运球\\Middlewares\\Third_Party\\FreeRTOS\\Source\\portable\\MemMang" "d:\\Desktop\\yunqiu\\R1_up\\Middlewares\\Third_Party\\FreeRTOS\\Source\\portable\\MemMang"
], ],
"defines": [ "defines": [
"USE_HAL_DRIVER", "USE_HAL_DRIVER",

View File

@ -86,3 +86,9 @@
[info] Log at : 2025/6/26|15:46:24|GMT+0800 [info] Log at : 2025/6/26|15:46:24|GMT+0800
>>>>>>> 7b54a46bd3c69e44a04ffd669bb7d3b115fc9e9b >>>>>>> 7b54a46bd3c69e44a04ffd669bb7d3b115fc9e9b
[info] Log at : 2025/6/30|23:46:31|GMT+0800
[info] Log at : 2025/6/30|23:48:14|GMT+0800
[info] Log at : 2025/6/30|23:49:51|GMT+0800