diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6291ce2..7fb39df 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -22,7 +22,7 @@ }, }, { - "label": "download jlink", + "label": "download jlink", // 要使用此任务,需添加jlink的环境变量 "type": "shell", "command":"mingw32-make download_jlink", // "mingw32-make -j24 ; mingw32-make download_dap" "group": { diff --git a/Makefile b/Makefile index c6f243c..d709577 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [3.18.0-B7] date: [Thu Apr 13 11:28:19 CST 2023] +# File automatically-generated by tool: [projectgenerator] version: [3.18.0-B7] date: [Thu Apr 13 11:37:21 CST 2023] ########################################################################################################################## # ------------------------------------------------ diff --git a/README.md b/README.md index ac7dd04..4eaa7b1 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ 在vscode-设置-扩展-C/C++-C_Cpp:style下修改。默认为`Visual Studio`。编写完新的代码后,使用右键-格式化文档(注:请勿对cube生成的文件使用此操作)。此操作不会改变文档的内容,但会改变缩进、空行、符号位置等,使代码更加统一、整洁。 + **在cubemx生成的文件(尤其是main.c和freertos.c)时,务必按照cubemx的提示将用户代码放在usercode注释代码块内,否则重新生成时会被覆盖.** + 请保持良好的注释编写习惯,建议安装doxygen插件。务必统一在.h文件中为外部接口编写注释,并给类型定义编写必要的注释。对于私有函数(.c文件中static修饰),请在.c文件中进行注释。对于复杂的代码段,也请添加注释。 每个功能模块编写完之后,及时添加说明文档。内容参照已有的文档,要进行简短的**总体说明、代码结构、外部接口和类型定义、私有函数和变量,以及使用的说明和范例**。如果有特别需要注意的地方,也请说明。 diff --git a/Src/usart.c b/Src/usart.c index 8595e32..5d513a2 100644 --- a/Src/usart.c +++ b/Src/usart.c @@ -46,7 +46,7 @@ void MX_USART1_UART_Init(void) /* USER CODE END USART1_Init 1 */ huart1.Instance = USART1; - huart1.Init.BaudRate = 115200; + huart1.Init.BaudRate = 921600; huart1.Init.WordLength = UART_WORDLENGTH_8B; huart1.Init.StopBits = UART_STOPBITS_1; huart1.Init.Parity = UART_PARITY_NONE; diff --git a/basic_framework.ioc b/basic_framework.ioc index 48dd651..6507887 100644 --- a/basic_framework.ioc +++ b/basic_framework.ioc @@ -626,7 +626,8 @@ TIM8.Channel-Output\ Compare3\ CH3=TIM_CHANNEL_3 TIM8.IPParameters=Channel-Output Compare1 CH1,Channel-Output Compare2 CH2,Channel-Output Compare3 CH3,Prescaler,Period TIM8.Period=19999 TIM8.Prescaler=167 -USART1.IPParameters=VirtualMode +USART1.BaudRate=921600 +USART1.IPParameters=VirtualMode,BaudRate USART1.VirtualMode=VM_ASYNC USART3.BaudRate=100000 USART3.IPParameters=VirtualMode,BaudRate,Parity,WordLength