From 0a3977c6f60cb8982f0d8fd9907482bfd0029a06 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 12 Sep 2024 09:39:41 +0800 Subject: [PATCH] V112 --- .vscode/settings.json | 3 ++- README.md | 2 ++ stm32basic | 2 +- usrc/project_configs.h | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7de1ea3..77869a8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -82,7 +82,8 @@ "public_service.h": "c", "stm32irq.h": "c", "project_configs.h": "c", - "*.bak": "c" + "*.bak": "c", + "stm32f4xx.h": "c" }, "files.autoGuessEncoding": false, "files.encoding": "utf8" diff --git a/README.md b/README.md index 39a66ec..81522fe 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,8 @@ 2. 增加电机refreshcfg接口 V111: 1.修复tmc5160电机控制错误 + V112 + 1.修复ADC采集导致的代码卡死BUG ``` diff --git a/stm32basic b/stm32basic index ea11d9f..cbc4bfd 160000 --- a/stm32basic +++ b/stm32basic @@ -1 +1 @@ -Subproject commit ea11d9f77beed2bf8145bbe490283c0830fa8a77 +Subproject commit cbc4bfd877ab7efefe281b29575aa7dcb93863a0 diff --git a/usrc/project_configs.h b/usrc/project_configs.h index 4835a38..ee08681 100644 --- a/usrc/project_configs.h +++ b/usrc/project_configs.h @@ -15,7 +15,7 @@ * @brief 基础配置 * */ -#define SOFTWARE_VERSION 111 // 软件版本 +#define SOFTWARE_VERSION 112 // 软件版本 #define HARDWARE_VERSION 1 // 硬件版本 #define PROJECT "transmit_disinfection_micro_re" // 工程名称 #define SN_HEADER "SN" // SN号前缀