From ba1dcee5cf8845deec6560808b2aa33fad3483a1 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 25 Apr 2024 20:50:47 +0800
Subject: [PATCH] update

---
 .cproject                                    |  16 +-
 .settings/com.st.stm32cube.ide.mcu.sfr.prefs |   3 +
 .settings/language.settings.xml              |   4 +-
 .settings/stm32cubeide.project.prefs         |   2 +-
 .vscode/settings.json                        |   3 +-
 Core/ThreadSafe/newlib_lock_glue.c           | 423 ---------------------------
 Core/ThreadSafe/stm32_lock.h                 | 375 ------------------------
 dbdb_liquid_path_control_v2.ioc              |   6 +-
 iflytop_canbus_protocol                      |   2 +-
 zaf_protocol                                 |   1 -
 zsdk                                         |   2 +-
 11 files changed, 15 insertions(+), 822 deletions(-)
 create mode 100644 .settings/com.st.stm32cube.ide.mcu.sfr.prefs
 delete mode 100644 Core/ThreadSafe/newlib_lock_glue.c
 delete mode 100644 Core/ThreadSafe/stm32_lock.h
 delete mode 160000 zaf_protocol

diff --git a/.cproject b/.cproject
index 79dd84c..181b9f1 100644
--- a/.cproject
+++ b/.cproject
@@ -23,13 +23,13 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2045742466" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.value.fpv4-sp-d16" valueType="enumerated"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.2108401733" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.value.hard" valueType="enumerated"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1574925555" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.244221814" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32F407VETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy | ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F | ../Drivers/CMSIS/Device/ST/STM32F4xx/Include | ../Drivers/CMSIS/Include | ../Core/ThreadSafe ||  ||  || USE_HAL_DRIVER | STM32F407xx | STM32_THREAD_SAFE_STRATEGY=4 ||  || Core/ThreadSafe | Drivers | Core/Startup | Middlewares | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F407VETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || FreeRTOS_AllowLockFromIRQ ||  ||  || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.244221814" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Debug || true || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32F407VETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy | ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F | ../Drivers/CMSIS/Device/ST/STM32F4xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F407xx ||  || Drivers | Core/Startup | Middlewares | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F407VETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.764397174" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="144" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.992660821" name="Convert to binary file (-O binary)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.494792904" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoscanffloat.176411214" name="Use float with scanf from newlib-nano (-u _scanf_float)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoscanffloat" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.164943344" name="Use float with printf from newlib-nano (-u _printf_float)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.386899990" name="Toolchain" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32.11.3.rel1" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.386899990" name="Toolchain" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32.12.3.rel1" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.553838709" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/a8000_hbot_robot_controler}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.764087106" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1243726437" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -46,7 +46,6 @@
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F407xx"/>
-									<listOptionValue builtIn="false" value="STM32_THREAD_SAFE_STRATEGY=4"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.550404719" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../Core/Inc"/>
@@ -60,7 +59,6 @@
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/sdk}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/usrc}&quot;"/>
-									<listOptionValue builtIn="false" value="../Core/ThreadSafe"/>
 								</option>
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.languagestandard.249988768" name="Language standard" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.languagestandard" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.languagestandard.value.gnu18" valueType="enumerated"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.330299437" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
@@ -72,7 +70,6 @@
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F407xx"/>
-									<listOptionValue builtIn="false" value="STM32_THREAD_SAFE_STRATEGY=4"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.638645730" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../Core/Inc"/>
@@ -86,7 +83,6 @@
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F4xx/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../Core/ThreadSafe"/>
 								</option>
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.languagestandard.1505174756" name="Language standard" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.languagestandard" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.languagestandard.value.gnupp20" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags.1130332628" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags" useByScannerDiscovery="true" valueType="stringList">
@@ -152,7 +148,7 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.1754497094" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.value.fpv4-sp-d16" valueType="enumerated"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.521529052" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi" useByScannerDiscovery="true" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.value.hard" valueType="enumerated"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1969880333" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.506604305" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32F407VETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy | ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F | ../Drivers/CMSIS/Device/ST/STM32F4xx/Include | ../Drivers/CMSIS/Include | ../Core/ThreadSafe ||  ||  || USE_HAL_DRIVER | STM32F407xx | STM32_THREAD_SAFE_STRATEGY=4 ||  || Core/ThreadSafe | Drivers | Core/Startup | Middlewares | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F407VETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || FreeRTOS_AllowLockFromIRQ ||  ||  || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.506604305" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.6 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.option.toolchain.value.workspace || STM32F407VETx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc | ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy | ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F | ../Drivers/CMSIS/Device/ST/STM32F4xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F407xx ||  || Drivers | Core/Startup | Middlewares | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F407VETX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.540585524" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" useByScannerDiscovery="false" value="144" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.959571701" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/a8000_hbot_robot_controler}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.948513973" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
@@ -166,7 +162,6 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2131696986" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F407xx"/>
-									<listOptionValue builtIn="false" value="STM32_THREAD_SAFE_STRATEGY=4"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.2033876918" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../Core/Inc"/>
@@ -177,7 +172,6 @@
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F4xx/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../Core/ThreadSafe"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1323998373" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
@@ -187,7 +181,6 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.1789839825" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
 									<listOptionValue builtIn="false" value="STM32F407xx"/>
-									<listOptionValue builtIn="false" value="STM32_THREAD_SAFE_STRATEGY=4"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.381800526" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../Core/Inc"/>
@@ -198,7 +191,6 @@
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F4xx/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
-									<listOptionValue builtIn="false" value="../Core/ThreadSafe"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.23378470" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
 							</tool>
@@ -221,8 +213,6 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="libzaf"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="zaf_protocol"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="usrc"/>
diff --git a/.settings/com.st.stm32cube.ide.mcu.sfr.prefs b/.settings/com.st.stm32cube.ide.mcu.sfr.prefs
new file mode 100644
index 0000000..b3fc47a
--- /dev/null
+++ b/.settings/com.st.stm32cube.ide.mcu.sfr.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+svd_custom_file_path=
+svd_file_path=platform\:/plugin/com.st.stm32cube.ide.mcu.productdb.debug/resources/cmsis/STMicroelectronics_CMSIS_SVD/STM32F407.svd
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 08fddea..f8ac9b4 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-421031688087318385" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1573541530361677026" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-405541582955734914" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1558051425230093555" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/.settings/stm32cubeide.project.prefs b/.settings/stm32cubeide.project.prefs
index 504799c..e17c40e 100644
--- a/.settings/stm32cubeide.project.prefs
+++ b/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
 635E684B79701B039C64EA45C3F84D30=C8B026EBE17C208F17FB66CE4235156C
 66BE74F758C12D739921AEA421D593D3=1
-8DF89ED150041C4CBC7CB9A9CAA90856=807DDB2C2702E438DB0EBF3D5AA6AB41
+8DF89ED150041C4CBC7CB9A9CAA90856=1A37C75E31949FC1CF47D46CC4BFA318
 DC22A860405A8BF2F2C095E5B6529F12=1A37C75E31949FC1CF47D46CC4BFA318
 eclipse.preferences.version=1
diff --git a/.vscode/settings.json b/.vscode/settings.json
index d229c1c..debe77c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -114,6 +114,5 @@
         "zlog.h": "c",
         "zbase.h": "c"
     },
-    "files.autoGuessEncoding": false,
-    "files.encoding": "gbk"
+    "files.autoGuessEncoding": false
 }
\ No newline at end of file
diff --git a/Core/ThreadSafe/newlib_lock_glue.c b/Core/ThreadSafe/newlib_lock_glue.c
deleted file mode 100644
index 8d956e4..0000000
--- a/Core/ThreadSafe/newlib_lock_glue.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/**
-  ******************************************************************************
-  * @file      newlib_lock_glue.c
-  * @author    STMicroelectronics
-  * @brief     Implementation of newlib lock interface
-  *
-  * @details   This file implements locking glue necessary to protect C library
-  *            functions and initialization of local static objects in C++.
-  *            Lock strategies are defined in stm32_lock.h that implements
-  *            different level of thread-safety.
-  *
-  *            For more information about which C functions need which of these
-  *            low level functions, please consult the newlib libc manual,
-  *            see https://sourceware.org/newlib/libc.html
-  *
-  *            For more information about the one-time construction API for C++,
-  *            see https://itanium-cxx-abi.github.io/cxx-abi/abi.html#once-ctor
-  *
-  ******************************************************************************
-  * @attention
-  *
-  * Copyright (c) 2023 STMicroelectronics.
-  * All rights reserved.
-  *
-  * This software is licensed under terms that can be found in the LICENSE file
-  * in the root directory of this software component.
-  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *
-  ******************************************************************************
-  */
-
-#if !defined (__GNUC__) || defined (__CC_ARM)
-#error "newlib_lock_glue.c" should be used with GNU Compilers only
-#endif /* !defined (__GNUC__) || defined (__CC_ARM) */
-
-/* Includes ------------------------------------------------------------------*/
-#include <cmsis_compiler.h>
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Global Error_Handler
-  */
-__WEAK void Error_Handler(void)
-{
-  /* Not used if it exists in project */
-  while (1);
-}
-
-#ifdef __SINGLE_THREAD__
-#warning C library is in single-threaded mode. Please take care when using C library functions in threaded contexts
-#else
-
-/* Includes ------------------------------------------------------------------*/
-#include <newlib.h>
-#include <stdatomic.h>
-#include "stm32_lock.h"
-
-/**
-  * @defgroup _newlib_lock_functions newlib library locks
-  * @see https://sourceware.org/newlib/libc.html
-  * @{
-  */
-
-#if __NEWLIB__ >= 3 && defined (_RETARGETABLE_LOCKING)
-#include <errno.h>
-#include <stdlib.h>
-#include <sys/lock.h>
-
-/* Private macros ------------------------------------------------------------*/
-/** See struct __lock definition */
-#define STM32_LOCK_PARAMETER(lock) (&(lock)->lock_data)
-
-/* Private variables ---------------------------------------------------------*/
-struct __lock
-{
-  LockingData_t lock_data; /**< The STM32 lock instance */
-};
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___sinit_recursive_mutex = { LOCKING_DATA_INIT };
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___sfp_recursive_mutex = { LOCKING_DATA_INIT };
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___atexit_recursive_mutex = { LOCKING_DATA_INIT };
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___at_quick_exit_mutex = { LOCKING_DATA_INIT };
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___malloc_recursive_mutex = { LOCKING_DATA_INIT };
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___env_recursive_mutex = { LOCKING_DATA_INIT };
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___tz_mutex = { LOCKING_DATA_INIT };
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___dd_hash_mutex = { LOCKING_DATA_INIT };
-
-/** Implementing mutex from <a href="https://sourceware.org/git/?p=newlib-cygwin.git;a=blob_plain;f=newlib/libc/misc/lock.c">newlib/libc/misc/lock.c</a> */
-struct __lock __lock___arc4random_mutex = { LOCKING_DATA_INIT };
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Initialize lock
-  * @param lock The lock
-  */
-void __retarget_lock_init(_LOCK_T *lock)
-{
-  __retarget_lock_init_recursive(lock);
-}
-
-/**
-  * @brief Initialize recursive lock
-  * @param lock The lock
-  */
-void __retarget_lock_init_recursive(_LOCK_T *lock)
-{
-  if (lock == NULL)
-  {
-    errno = EINVAL;
-    return;
-  }
-
-  *lock = (_LOCK_T)malloc(sizeof(struct __lock));
-  if (*lock != NULL)
-  {
-    stm32_lock_init(STM32_LOCK_PARAMETER(*lock));
-    return;
-  }
-
-  /* Unable to allocate memory */
-  STM32_LOCK_BLOCK();
-}
-
-/**
-  * @brief Close lock
-  * @param lock The lock
-  */
-void __retarget_lock_close(_LOCK_T lock)
-{
-  __retarget_lock_close_recursive(lock);
-}
-
-/**
-  * @brief Close recursive lock
-  * @param lock The lock
-  */
-void __retarget_lock_close_recursive(_LOCK_T lock)
-{
-  free(lock);
-}
-
-/**
-  * @brief Acquire lock
-  * @param lock The lock
-  */
-void __retarget_lock_acquire(_LOCK_T lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  stm32_lock_acquire(STM32_LOCK_PARAMETER(lock));
-}
-
-/**
-  * @brief Acquire recursive lock
-  * @param lock The lock
-  */
-void __retarget_lock_acquire_recursive(_LOCK_T lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  stm32_lock_acquire(STM32_LOCK_PARAMETER(lock));
-}
-
-/**
-  * @brief Try acquire lock
-  * @param lock The lock
-  * @return 0 always
-  */
-int __retarget_lock_try_acquire(_LOCK_T lock)
-{
-  __retarget_lock_acquire(lock);
-  return 0;
-}
-
-/**
-  * @brief Try acquire recursive lock
-  * @param lock The lock
-  * @return 0 always
-  */
-int __retarget_lock_try_acquire_recursive(_LOCK_T lock)
-{
-  __retarget_lock_acquire_recursive(lock);
-  return 0;
-}
-
-/**
-  * @brief Release lock
-  * @param lock The lock
-  */
-void __retarget_lock_release(_LOCK_T lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  stm32_lock_release(STM32_LOCK_PARAMETER(lock));
-}
-
-/**
-  * @brief Release recursive lock
-  * @param lock The lock
-  */
-void __retarget_lock_release_recursive(_LOCK_T lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  stm32_lock_release(STM32_LOCK_PARAMETER(lock));
-}
-
-#else
-#warning This makes malloc, env, and TZ calls thread-safe, not the entire newlib
-
-/* Includes ------------------------------------------------------------------*/
-#include <reent.h>
-
-/* Private variables ---------------------------------------------------------*/
-/** Mutex used in __malloc_lock and __malloc_unlock */
-static LockingData_t __lock___malloc_recursive_mutex = LOCKING_DATA_INIT;
-
-/** Mutex used in __env_lock and __env_unlock */
-static LockingData_t __lock___env_recursive_mutex = LOCKING_DATA_INIT;
-
-/** Mutex used in __tz_lock and __tz_unlock */
-static LockingData_t __lock___tz_mutex = LOCKING_DATA_INIT;
-
-/* Private functions ---------------------------------------------------------*/
-
-#if __STD_C
-
-/**
-  * @brief Acquire malloc lock
-  * @param reent The reentrance struct
-  */
-void __malloc_lock(struct _reent *reent)
-{
-  STM32_LOCK_UNUSED(reent);
-  stm32_lock_acquire(&__lock___malloc_recursive_mutex);
-}
-
-/**
-  * @brief Release malloc lock
-  * @param reent The reentrance struct
-  */
-void __malloc_unlock(struct _reent *reent)
-{
-  STM32_LOCK_UNUSED(reent);
-  stm32_lock_release(&__lock___malloc_recursive_mutex);
-}
-
-#else
-
-/**
-  * @brief Acquire malloc lock
-  */
-void __malloc_lock()
-{
-  stm32_lock_acquire(&__lock___malloc_recursive_mutex);
-}
-
-/**
-  * @brief Release malloc lock
-  */
-void __malloc_unlock()
-{
-  stm32_lock_release(&__lock___malloc_recursive_mutex);
-}
-#endif /* __STD_C */
-
-/**
-  * @brief Acquire env lock
-  * @param reent The reentrance struct
-  */
-void __env_lock(struct _reent *reent)
-{
-  STM32_LOCK_UNUSED(reent);
-  stm32_lock_acquire(&__lock___env_recursive_mutex);
-}
-
-/**
-  * @brief Release env lock
-  * @param reent The reentrance struct
-  */
-void __env_unlock(struct _reent *reent)
-{
-  STM32_LOCK_UNUSED(reent);
-  stm32_lock_release(&__lock___env_recursive_mutex);
-}
-
-/**
-  * @brief Acquire tz lock
-  */
-void __tz_lock()
-{
-  stm32_lock_acquire(&__lock___tz_mutex);
-}
-
-/**
-  * @brief Release tz lock
-  */
-void __tz_unlock()
-{
-  stm32_lock_release(&__lock___tz_mutex);
-}
-
-#endif /* __NEWLIB__ >= 3 && defined (_RETARGETABLE_LOCKING) */
-
-/**
-  * @}
-  */
-
-
-/**
-  * @defgroup __cxa_guard_ GNU C++ one-time construction API
-  * @see https://itanium-cxx-abi.github.io/cxx-abi/abi.html#once-ctor
-  *
-  * When building for C++, please make sure that <tt>-fno-threadsafe-statics</tt> is not passed to the compiler
-  * @{
-  */
-
-/* Private typedef -----------------------------------------------------------*/
-/** The guard object is created by the C++ compiler and is 32 bit for ARM EABI. */
-typedef struct
-{
-  atomic_uchar initialized; /**< Indicate if object is initialized */
-  uint8_t acquired; /**< Ensure non-recursive lock */
-  uint16_t unused; /**< Padding */
-} __attribute__((packed)) CxaGuardObject_t;
-
-/* Private variables ---------------------------------------------------------*/
-/** Mutex used in __cxa_guard_acquire, __cxa_guard_release and __cxa_guard_abort */
-static LockingData_t __cxa_guard_mutex = LOCKING_DATA_INIT;
-
-/* Private functions ---------------------------------------------------------*/
-
-/**
-  * @brief Acquire __cxa_guard mutex
-  * @param guard_object Guard object
-  * @return 0 if object is initialized, else initialization of object required
-  */
-int __cxa_guard_acquire(CxaGuardObject_t *guard_object)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(guard_object);
-
-  if (atomic_load(&guard_object->initialized) == 0)
-  {
-    /* Object needs initialization, lock threading context */
-    stm32_lock_acquire(&__cxa_guard_mutex);
-    if (atomic_load(&guard_object->initialized) == 0)
-    {
-      /* Object needs initialization */
-      if (guard_object->acquired)
-      {
-        /* Object initialization already in progress */
-        STM32_LOCK_BLOCK();
-      }
-
-      /* Lock acquired */
-      guard_object->acquired = 1;
-      return 1;
-    }
-    else
-    {
-      /* Object initialized in another thread */
-      stm32_lock_release(&__cxa_guard_mutex);
-    }
-  }
-
-  /* Object already initialized */
-  return 0;
-}
-
-/**
-  * @brief Abort __cxa_guard mutex
-  * @param guard_object Guard object
-  */
-void __cxa_guard_abort(CxaGuardObject_t *guard_object)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(guard_object);
-
-  if (guard_object->acquired)
-  {
-    /* Release lock */
-    guard_object->acquired = 0;
-    stm32_lock_release(&__cxa_guard_mutex);
-  }
-  else
-  {
-    /* Trying to release non-acquired lock */
-    STM32_LOCK_BLOCK();
-  }
-}
-
-/**
-  * @brief Release __cxa_guard mutex
-  * @param guard_object Guard object
-  */
-void __cxa_guard_release(CxaGuardObject_t *guard_object)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(guard_object);
-
-  /* Object initialized */
-  atomic_store(&guard_object->initialized, 1);
-
-  /* Release lock */
-  __cxa_guard_abort(guard_object);
-}
-
-/**
-  * @}
-  */
-
-#endif /* __SINGLE_THREAD__ */
diff --git a/Core/ThreadSafe/stm32_lock.h b/Core/ThreadSafe/stm32_lock.h
deleted file mode 100644
index 372c5de..0000000
--- a/Core/ThreadSafe/stm32_lock.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/**
-  ******************************************************************************
-  * @file      stm32_lock.h
-  * @author    STMicroelectronics
-  * @brief     STMicroelectronics lock mechanisms
-  *
-  * @details
-  * This implementation supports the following strategies for handling
-  * thread-safe locks. The strategy can be explicitly selected by
-  * defining <tt>\STM32_THREAD_SAFE_STRATEGY = \<number></tt> in the project.
-  * Please look at the '<toolchain/library>_lock_glue.c' file for more details.
-  *
-  * 1. User defined thread-safe implementation.
-  *    User defined solution for handling thread-safety.
-  *    <br>
-  *    <b>NOTE:</b> The stubs in stm32_lock_user.h needs to be implemented to gain
-  *    thread-safety.
-  *
-  * 2. [<b>DEFAULT</b>] Allow lock usage from interrupts.
-  *    This implementation will ensure thread-safety by disabling all interrupts
-  *    during e.g. calls to malloc.
-  *    <br>
-  *    <b>NOTE:</b> Disabling all interrupts creates interrupt latency which
-  *    might not be desired for this application!
-  *
-  * 3. Deny lock usage from interrupts.
-  *    This implementation assumes single thread of execution.
-  *    <br>
-  *    <b>NOTE:</b> Thread-safety dependent functions will enter an infinity loop
-  *    if used in interrupt context.
-  *
-  * 4. Allow lock usage from interrupts. Implemented using FreeRTOS locks.
-  *    This implementation will ensure thread-safety by entering RTOS ISR capable
-  *    critical sections during e.g. calls to malloc.
-  *    By default this implementation supports 2 levels of recursive locking.
-  *    Adding additional levels requires 4 bytes per lock per level of RAM.
-  *    <br>
-  *    <b>NOTE:</b> Interrupts with high priority are not disabled. This implies
-  *    that the lock is not thread-safe from high priority interrupts!
-  *
-  * 5. Deny lock usage from interrupts. Implemented using FreeRTOS locks.
-  *    This implementation will ensure thread-safety by suspending all tasks
-  *    during e.g. calls to malloc.
-  *    <br>
-  *    <b>NOTE:</b> Thread-safety dependent functions will enter an infinity loop
-  *    if used in interrupt context.
-  *
-  ******************************************************************************
-  * @attention
-  *
-  * Copyright (c) 2023 STMicroelectronics.
-  * All rights reserved.
-  *
-  * This software is licensed under terms that can be found in the LICENSE file
-  * in the root directory of this software component.
-  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *
-  ******************************************************************************
-  */
-
-#ifndef __STM32_LOCK_H__
-#define __STM32_LOCK_H__
-
-/* Includes ------------------------------------------------------------------*/
-#include <stdint.h>
-#include <stddef.h>
-#include <cmsis_compiler.h>
-
-#ifndef STM32_THREAD_SAFE_STRATEGY
-#define STM32_THREAD_SAFE_STRATEGY 2 /**< Assume strategy 2 if not specified */
-#endif /* STM32_THREAD_SAFE_STRATEGY */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Function prototypes -------------------------------------------------------*/
-void Error_Handler(void);
-
-/* Public macros -------------------------------------------------------------*/
-/** Blocks execution */
-#define STM32_LOCK_BLOCK()                      \
-  do                                            \
-  {                                             \
-    __disable_irq();                            \
-    Error_Handler();                            \
-    while (1);                                  \
-  } while (0)
-
-/** Blocks execution if argument is NULL */
-#define STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(x)    \
-  do                                            \
-  {                                             \
-    if ((x) == NULL)                            \
-    {                                           \
-      STM32_LOCK_BLOCK();                       \
-    }                                           \
-  } while (0)
-
-/** Blocks execution if in interrupt context */
-#define STM32_LOCK_BLOCK_IF_INTERRUPT_CONTEXT() \
-  do                                            \
-  {                                             \
-    if (__get_IPSR())                           \
-    {                                           \
-      STM32_LOCK_BLOCK();                       \
-    }                                           \
-  } while (0)
-
-/** Hide unused parameter warning from compiler */
-#define STM32_LOCK_UNUSED(var) (void)var
-
-/** Size of array */
-#define STM32_LOCK_ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0]))
-
-#if STM32_THREAD_SAFE_STRATEGY == 1
-/*
- * User defined thread-safe implementation.
- */
-
-/* Includes ----------------------------------------------------------------*/
-/** STM32 lock API version */
-#define STM32_LOCK_API 1
-#include "stm32_lock_user.h"
-#undef STM32_LOCK_API
-
-#elif STM32_THREAD_SAFE_STRATEGY == 2
-/*
- * Allow lock usage from interrupts.
- */
-
-/* Private defines ---------------------------------------------------------*/
-/** Initialize members in instance of <code>LockingData_t</code> structure */
-#define LOCKING_DATA_INIT { 0, 0 }
-
-/* Private typedef ---------------------------------------------------------*/
-typedef struct
-{
-  uint8_t flag; /**< Backup of PRIMASK.PM at nesting level 0 */
-  uint8_t counter; /**< Nesting level */
-} LockingData_t;
-
-/* Private functions -------------------------------------------------------*/
-
-/**
-  * @brief Initialize STM32 lock
-  * @param lock The lock to init
-  */
-static inline void stm32_lock_init(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  lock->flag = 0;
-  lock->counter = 0;
-}
-
-/**
-  * @brief Acquire STM32 lock
-  * @param lock The lock to acquire
-  */
-static inline void stm32_lock_acquire(LockingData_t *lock)
-{
-  uint8_t flag = (uint8_t)(__get_PRIMASK() & 0x1); /* PRIMASK.PM */
-  __disable_irq();
-  __DSB();
-  __ISB();
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  if (lock->counter == 0)
-  {
-    lock->flag = flag;
-  }
-  else if (lock->counter == UINT8_MAX)
-  {
-    STM32_LOCK_BLOCK();
-  }
-  lock->counter++;
-}
-
-/**
-  * @brief Release STM32 lock
-  * @param lock The lock to release
-  */
-static inline void stm32_lock_release(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  if (lock->counter == 0)
-  {
-    STM32_LOCK_BLOCK();
-  }
-  lock->counter--;
-  if (lock->counter == 0 && lock->flag == 0)
-  {
-    __enable_irq();
-  }
-}
-
-#elif STM32_THREAD_SAFE_STRATEGY == 3
-/*
- * Deny lock usage from interrupts.
- */
-
-/* Private defines ---------------------------------------------------------*/
-/** Initialize members in instance of <code>LockingData_t</code> structure */
-#define LOCKING_DATA_INIT 0
-
-/* Private typedef ---------------------------------------------------------*/
-typedef uint8_t LockingData_t;  /**< Unused */
-
-/* Private functions -------------------------------------------------------*/
-
-/**
-  * @brief Initialize STM32 lock
-  * @param lock The lock to init
-  */
-static inline void stm32_lock_init(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-}
-
-/**
-  * @brief Acquire STM32 lock
-  * @param lock The lock to acquire
-  */
-static inline void stm32_lock_acquire(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  STM32_LOCK_BLOCK_IF_INTERRUPT_CONTEXT();
-}
-
-/**
-  * @brief Release ST lock
-  * @param lock The lock to release
-  */
-static inline void stm32_lock_release(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  STM32_LOCK_BLOCK_IF_INTERRUPT_CONTEXT();
-}
-
-#elif STM32_THREAD_SAFE_STRATEGY == 4
-/*
- * Allow lock usage from interrupts. Implemented using FreeRTOS locks.
- */
-
-/* Includes ----------------------------------------------------------------*/
-#include <FreeRTOS.h>
-#include <task.h>
-
-#if defined (__GNUC__) && !defined (__CC_ARM) && configUSE_NEWLIB_REENTRANT == 0
-#warning Please set configUSE_NEWLIB_REENTRANT to 1 in FreeRTOSConfig.h, otherwise newlib will not be thread-safe
-#endif /* defined (__GNUC__) && !defined (__CC_ARM) && configUSE_NEWLIB_REENTRANT == 0 */
-
-/* Private defines ---------------------------------------------------------*/
-/** Initialize members in instance of <code>LockingData_t</code> structure */
-#define LOCKING_DATA_INIT { {0, 0}, 0 }
-#define STM32_LOCK_MAX_NESTED_LEVELS 2 /**< Max nesting level of interrupts */
-typedef struct
-{
-  uint32_t basepri[STM32_LOCK_MAX_NESTED_LEVELS];
-  uint8_t nesting_level;
-} LockingData_t;
-
-/* Private macros ----------------------------------------------------------*/
-/** Blocks execution if reached max nesting level */
-#define STM32_LOCK_ASSERT_VALID_NESTING_LEVEL(lock)                   \
-  do                                                                  \
-  {                                                                   \
-    if (lock->nesting_level >= STM32_LOCK_ARRAY_SIZE(lock->basepri))  \
-    {                                                                 \
-      STM32_LOCK_BLOCK();                                             \
-    }                                                                 \
-  } while (0)
-
-/* Private functions -------------------------------------------------------*/
-
-/**
-  * @brief Initialize STM32 lock
-  * @param lock The lock to init
-  */
-static inline void stm32_lock_init(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  for (size_t i = 0; i < STM32_LOCK_ARRAY_SIZE(lock->basepri); i++)
-  {
-    lock->basepri[i] = 0;
-  }
-  lock->nesting_level = 0;
-}
-
-/**
-  * @brief Acquire STM32 lock
-  * @param lock The lock to acquire
-  */
-static inline void stm32_lock_acquire(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  STM32_LOCK_ASSERT_VALID_NESTING_LEVEL(lock);
-  lock->basepri[lock->nesting_level++] = taskENTER_CRITICAL_FROM_ISR();
-}
-
-/**
-  * @brief Release STM32 lock
-  * @param lock The lock to release
-  */
-static inline void stm32_lock_release(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  lock->nesting_level--;
-  STM32_LOCK_ASSERT_VALID_NESTING_LEVEL(lock);
-  taskEXIT_CRITICAL_FROM_ISR(lock->basepri[lock->nesting_level]);
-}
-
-#undef STM32_LOCK_ASSERT_VALID_NESTING_LEVEL
-#undef STM32_LOCK_MAX_NESTED_LEVELS
-
-#elif STM32_THREAD_SAFE_STRATEGY == 5
-/*
- * Deny lock usage from interrupts. Implemented using FreeRTOS locks.
- */
-
-/* Includes ----------------------------------------------------------------*/
-#include <FreeRTOS.h>
-#include <task.h>
-#if defined (__GNUC__) && !defined (__CC_ARM) && configUSE_NEWLIB_REENTRANT == 0
-#warning Please set configUSE_NEWLIB_REENTRANT to 1 in FreeRTOSConfig.h, otherwise newlib will not be thread-safe
-#endif /* defined (__GNUC__) && !defined (__CC_ARM) && configUSE_NEWLIB_REENTRANT == 0 */
-
-/* Private defines ---------------------------------------------------------*/
-/** Initialize members in instance of <code>LockingData_t</code> structure */
-#define LOCKING_DATA_INIT 0
-
-/* Private typedef ---------------------------------------------------------*/
-typedef uint8_t LockingData_t;  /**< Unused */
-
-/* Private functions -------------------------------------------------------*/
-
-/**
-  * @brief Initialize STM32 lock
-  * @param lock The lock to init
-  */
-static inline void stm32_lock_init(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-}
-
-/**
-  * @brief Acquire STM32 lock
-  * @param lock The lock to acquire
-  */
-static inline void stm32_lock_acquire(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  STM32_LOCK_BLOCK_IF_INTERRUPT_CONTEXT();
-  vTaskSuspendAll();
-}
-
-/**
-  * @brief Release STM32 lock
-  * @param lock The lock to release
-  */
-static inline void stm32_lock_release(LockingData_t *lock)
-{
-  STM32_LOCK_BLOCK_IF_NULL_ARGUMENT(lock);
-  STM32_LOCK_BLOCK_IF_INTERRUPT_CONTEXT();
-  xTaskResumeAll();
-}
-
-#else
-#error Invalid STM32_THREAD_SAFE_STRATEGY specified
-#endif /* STM32_THREAD_SAFE_STRATEGY */
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __STM32_LOCK_H__ */
diff --git a/dbdb_liquid_path_control_v2.ioc b/dbdb_liquid_path_control_v2.ioc
index 1774ac1..a629727 100644
--- a/dbdb_liquid_path_control_v2.ioc
+++ b/dbdb_liquid_path_control_v2.ioc
@@ -106,8 +106,8 @@ Mcu.PinsNb=27
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
 Mcu.UserName=STM32F407VETx
-MxCube.Version=6.9.0
-MxDb.Version=DB.6.0.90
+MxCube.Version=6.11.0
+MxDb.Version=DB.6.0.110
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false\:false
 NVIC.DMA1_Stream1_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true
 NVIC.DMA1_Stream3_IRQn=true\:5\:0\:false\:false\:true\:true\:false\:true\:true
@@ -186,7 +186,7 @@ ProjectManager.CustomerFirmwarePackage=
 ProjectManager.DefaultFWLocation=true
 ProjectManager.DeletePrevious=false
 ProjectManager.DeviceId=STM32F407VETx
-ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.27.1
+ProjectManager.FirmwarePackage=STM32Cube FW_F4 V1.28.0
 ProjectManager.FreePins=true
 ProjectManager.HalAssertFull=true
 ProjectManager.HeapSize=0x0000
diff --git a/iflytop_canbus_protocol b/iflytop_canbus_protocol
index 00f60b2..10cc46e 160000
--- a/iflytop_canbus_protocol
+++ b/iflytop_canbus_protocol
@@ -1 +1 @@
-Subproject commit 00f60b2f73b4995356bab989a2f5950ecfa9019b
+Subproject commit 10cc46e16b72fb11200ad3a4f54531cf5f01243e
diff --git a/zaf_protocol b/zaf_protocol
deleted file mode 160000
index 1f37a71..0000000
--- a/zaf_protocol
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1f37a710c5a4cb8fee30ced8e246488310f9017a
diff --git a/zsdk b/zsdk
index 416dfe2..08c90d1 160000
--- a/zsdk
+++ b/zsdk
@@ -1 +1 @@
-Subproject commit 416dfe21dc9c7d2a06e3ee653a9d76e96e9a2a05
+Subproject commit 08c90d17c07192dc8c0e488b189bf8ef0e47a5e7