From 98463aa9f12923710e9e7d844a889ee57973cd26 Mon Sep 17 00:00:00 2001
From: Timothy Yin <master@uniiem.com>
Date: Sat, 29 Mar 2025 16:55:09 +0800
Subject: [PATCH] feat: implement OneNet communication and ESP8266 integration
 break: switch to c8t6

---
 .cproject                                     |  174 +-
 .idea/workspace.xml                           |   99 +-
 .mxproject                                    |    4 +-
 .osx.project                                  |    0
 CMakeLists.txt                                |    8 +-
 Core/Inc/MqttKit.h                            |  183 +++
 Core/Inc/MqttKit/common.h                     |   17 +
 Core/Inc/OneNet.h                             |   15 +
 Core/Inc/esp8266.h                            |   18 +
 Core/Inc/stm32f1xx_it.h                       |    2 +
 Core/Src/MqttKit.c                            | 1399 +++++++++++++++++
 Core/Src/OneNet.c                             |  236 +++
 Core/Src/esp8266.c                            |  256 +++
 Core/Src/gpio.c                               |   20 +-
 Core/Src/i2c.c                                |    1 -
 Core/Src/main.c                               |  140 +-
 Core/Src/stm32f1xx_it.c                       |   31 +-
 Core/Src/usart.c                              |   10 +
 ...tm32f103c6tx.s => startup_stm32f103c8tx.s} |   34 +-
 .../Include/{stm32f103x6.h => stm32f103xb.h}  |  229 ++-
 IntelliChargingPile.ioc                       |   29 +-
 ...103C6TX_FLASH.ld => STM32F103C8TX_FLASH.ld |   10 +-
 22 files changed, 2725 insertions(+), 190 deletions(-)
 create mode 100644 .osx.project
 create mode 100644 Core/Inc/MqttKit.h
 create mode 100644 Core/Inc/MqttKit/common.h
 create mode 100644 Core/Inc/OneNet.h
 create mode 100644 Core/Inc/esp8266.h
 create mode 100644 Core/Src/MqttKit.c
 create mode 100644 Core/Src/OneNet.c
 create mode 100644 Core/Src/esp8266.c
 rename Core/Startup/{startup_stm32f103c6tx.s => startup_stm32f103c8tx.s} (92%)
 rename Drivers/CMSIS/Device/ST/STM32F1xx/Include/{stm32f103x6.h => stm32f103xb.h} (98%)
 rename STM32F103C6TX_FLASH.ld => STM32F103C8TX_FLASH.ld (95%)

diff --git a/.cproject b/.cproject
index a8dc553..fad6e89 100644
--- a/.cproject
+++ b/.cproject
@@ -17,12 +17,12 @@
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.814891035" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.814891035." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2071415880" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.687963508" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32F103C6Tx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.687963508" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32F103C8Tx" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.220797653" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1725778148" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.980258812" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1409177180" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" 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 || STM32F103C6Tx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F103x6 ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F103C6TX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1332660584" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" value="72" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1409177180" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" 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 || STM32F103C8Tx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F103xB ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1332660584" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" value="72" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1160773057" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/IntelliChargingPile}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.951453353" 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.833204619" name="MCU/MPU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
@@ -38,7 +38,7 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1039254510" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32F103x6"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1219243171" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="../Core/Inc"/>
@@ -54,7 +54,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.153506033" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.2067923663" name="MCU/MPU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1361344259" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103C6TX_FLASH.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1361344259" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld}" valueType="string"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.144241254" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -95,11 +95,11 @@
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.443603774" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
 					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.443603774." name="/" resourcePath="">
 						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.802778952" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1710669851" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32F103C6Tx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1710669851" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32F103C8Tx" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1547452964" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.837299935" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2107287423" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.116280274" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" 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 || STM32F103C6Tx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F103x6 ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F103C6TX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.116280274" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" 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 || STM32F103C8Tx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F103xB ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
 							<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1680486449" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock" value="72" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1946953861" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
 							<builder buildPath="${workspace_loc:/IntelliChargingPile}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1869421408" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
@@ -112,7 +112,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.621646539" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1102053990" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32F103x6"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1809652967" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
 									<listOptionValue builtIn="false" value="../Core/Inc"/>
@@ -128,7 +128,7 @@
 								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1633802423" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
 							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.789225081" name="MCU/MPU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1424915329" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103C6TX_FLASH.ld}" valueType="string"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1424915329" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld}" valueType="string"/>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1148844000" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -153,6 +153,156 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2147174834">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2147174834" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2147174834" name="Debug" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2147174834." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.532909735" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1412543162" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32F103C8Tx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.927084252" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.301944739" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.752553517" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1563374486" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" 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 || STM32F103C8Tx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F103xB ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1363457574" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/IntelliChargingPile}/Debug" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.2031475903" managedBuildOn="true" name="Gnu Make Builder.Debug" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1535010169" name="MCU/MPU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1411612171" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.70465748" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.825131308" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.826969341" name="MCU/MPU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.532729259" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.279225480" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1111118852" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="DEBUG"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1048135119" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+									<listOptionValue builtIn="false" value="../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../Drivers/STM32F1xx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F1xx/Include"/>
+									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.428072930" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1742033079" name="MCU/MPU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.976830687" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.2032159445" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1384155744" name="MCU/MPU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.384425751" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.2027479635" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.167789217" name="MCU/MPU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.473076367" name="MCU/MPU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1743206436" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1696067822" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1889756205" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.722782940" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1088582844" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.605794281" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.378554828" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1919156908">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1919156908" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1919156908" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1919156908." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.1405932358" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.441543132" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" value="STM32F103C8Tx" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1011774161" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.26573265" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.65478176" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.54932062" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" 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 || STM32F103C8Tx || 0 || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include ||  ||  || USE_HAL_DRIVER | STM32F103xB ||  || Drivers | Core/Startup | Core ||  ||  || ${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld} || true || NonSecure ||  || secure_nsclib.o ||  || None ||  ||  || " valueType="string"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1102931725" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/IntelliChargingPile}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1220380778" managedBuildOn="true" name="Gnu Make Builder.Release" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.316225618" name="MCU/MPU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.93075213" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.38105582" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1337628294" name="MCU/MPU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.941336277" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1960876055" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2067508506" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.479830508" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" valueType="includePath">
+									<listOptionValue builtIn="false" value="../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../Drivers/STM32F1xx_HAL_Driver/Inc"/>
+									<listOptionValue builtIn="false" value="../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy"/>
+									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F1xx/Include"/>
+									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.543213592" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1622996685" name="MCU/MPU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.435631275" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g0" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1529033638" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.567906339" name="MCU/MPU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.1911122619" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103C8TX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1827443722" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.806392827" name="MCU/MPU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1386674507" name="MCU/MPU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1263296650" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.680099726" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.710096860" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.29093842" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1288760325" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1325123784" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1485959066" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.pathentry"/>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -164,8 +314,14 @@
 		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.814891035;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.814891035.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.2011359931;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.314023116">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1919156908;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1919156908.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1337628294;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.543213592">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.443603774;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.443603774.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.591769015;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1829795016">
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2147174834;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.2147174834.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.826969341;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.428072930">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
 	</storageModule>
 </cproject>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c66a02a..f44721e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -25,61 +25,33 @@
   </component>
   <component name="CMakeSettings" AUTO_RELOAD="true">
     <configurations>
-      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DCMAKE_EXE_LINKER_FLAGS:STRING=--specs=nano.specs" />
+      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DCMAKE_EXE_LINKER_FLAGS:STRING=&quot;--specs=nosys.specs --specs=nano.specs -u _printf_float -u _scanf_float&quot;" />
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="56631632-52f0-4e39-b905-89e46eb6e768" name="Changes" comment="fix: update line endings and adjust stlink configuration">
-      <change beforePath="$PROJECT_DIR$/.idea/editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/editor.xml" afterDir="false" />
+    <list default="true" id="56631632-52f0-4e39-b905-89e46eb6e768" name="Changes" comment="feat: add USART2 initialization and EXTI15_10 interrupt handler">
+      <change afterPath="$PROJECT_DIR$/Core/Inc/MqttKit.h" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Core/Inc/MqttKit/common.h" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Core/Inc/OneNet.h" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Core/Inc/esp8266.h" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Core/Src/MqttKit.c" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Core/Src/OneNet.c" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Core/Src/esp8266.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.cproject" beforeDir="false" afterPath="$PROJECT_DIR$/.cproject" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.mxproject" beforeDir="false" afterPath="$PROJECT_DIR$/.mxproject" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Inc/gpio.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/gpio.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Inc/i2c.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/i2c.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Inc/main.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/main.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Inc/spi.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/spi.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Inc/stm32f1xx_hal_conf.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/stm32f1xx_hal_conf.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Core/Inc/stm32f1xx_it.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/stm32f1xx_it.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Inc/usart.h" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Inc/usart.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Core/Src/gpio.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/gpio.c" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Core/Src/i2c.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/i2c.c" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Core/Src/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/main.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Src/retarget.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/retarget.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Src/spi.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/spi.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Core/Src/stm32f1xx_hal_msp.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/stm32f1xx_hal_msp.c" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Core/Src/stm32f1xx_it.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/stm32f1xx_it.c" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Core/Src/usart.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/usart.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_armcc.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_armcc.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_armclang.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_armclang.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_compiler.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_compiler.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_gcc.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_gcc.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_iccarm.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_iccarm.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_version.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/cmsis_version.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_armv8mbl.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_armv8mbl.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_armv8mml.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_armv8mml.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm0.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm0.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm0plus.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm0plus.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm1.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm1.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm23.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm23.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm3.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm3.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm33.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm33.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm4.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm4.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm7.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_cm7.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_sc000.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_sc000.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_sc300.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/core_sc300.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/mpu_armv7.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/mpu_armv7.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/mpu_armv8.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/mpu_armv8.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Include/tz_context.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/Include/tz_context.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/LICENSE.txt" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/CMSIS/LICENSE.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c" beforeDir="false" afterPath="$PROJECT_DIR$/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Core/Startup/startup_stm32f103c6tx.s" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/IntelliChargingPile.ioc" beforeDir="false" afterPath="$PROJECT_DIR$/IntelliChargingPile.ioc" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/stlinkv2.cfg" beforeDir="false" afterPath="$PROJECT_DIR$/stlinkv2.cfg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/STM32F103C6TX_FLASH.ld" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -131,8 +103,12 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Core/Inc/MqttKit.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Core/Inc/OneNet.h" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Core/Src/MqttKit.c" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Core/Src/OneNet.c" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Core/Src/esp8266.c" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$PROJECT_DIR$/Core/Src/main.c" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="ProjectApplicationVersion">
     <option name="ide" value="CLion" />
@@ -167,28 +143,33 @@
     &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
     &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
     &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;last_opened_file_path&quot;: &quot;V:/projects/School/IntelliChargingPile&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/Users/timothy/Workbench/embedded/project/IntelliChargingPile/Core/Inc&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
     &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
     &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;editor.preferences.fonts.default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;CMakeSettings&quot;,
     &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
 }</component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/Core/Inc" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/Core/Src" />
+      <recent name="$PROJECT_DIR$/Core/Inc" />
       <recent name="V:\projects\School\IntelliChargingPile\Core\Inc" />
     </key>
   </component>
   <component name="RunManager" selected="OpenOCD Download &amp; Run.OCD IntelliChargingPile">
-    <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true">
+    <configuration name="IntelliChargingPile.elf" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="IntelliChargingPile" TARGET_NAME="IntelliChargingPile.elf" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="IntelliChargingPile" RUN_TARGET_NAME="IntelliChargingPile.elf">
       <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
+        <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
     </configuration>
-    <configuration name="IntelliChargingPile.elf" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="IntelliChargingPile" TARGET_NAME="IntelliChargingPile.elf" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="IntelliChargingPile" RUN_TARGET_NAME="IntelliChargingPile.elf">
+    <configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
       </method>
@@ -223,7 +204,10 @@
       <workItem from="1742497908822" duration="4076000" />
       <workItem from="1742502978318" duration="4091000" />
       <workItem from="1742648760204" duration="1509000" />
-      <workItem from="1742695566108" duration="7210000" />
+      <workItem from="1742695566108" duration="27380000" />
+      <workItem from="1742921787723" duration="122000" />
+      <workItem from="1742922483913" duration="4908000" />
+      <workItem from="1743226271023" duration="8706000" />
     </task>
     <task id="LOCAL-00001" summary="initial commit: oled, rc522, exti">
       <option name="closed" value="true" />
@@ -257,7 +241,15 @@
       <option name="project" value="LOCAL" />
       <updated>1742503072799</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="feat: add USART2 initialization and EXTI15_10 interrupt handler">
+      <option name="closed" value="true" />
+      <created>1742883327540</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1742883327540</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -273,7 +265,8 @@
     <MESSAGE value="feat: usart retarget" />
     <MESSAGE value="feat: rcc522 card reader" />
     <MESSAGE value="fix: update line endings and adjust stlink configuration" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix: update line endings and adjust stlink configuration" />
+    <MESSAGE value="feat: add USART2 initialization and EXTI15_10 interrupt handler" />
+    <option name="LAST_COMMIT_MESSAGE" value="feat: add USART2 initialization and EXTI15_10 interrupt handler" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />
diff --git a/.mxproject b/.mxproject
index 7386641..dbd21a4 100644
--- a/.mxproject
+++ b/.mxproject
@@ -1,10 +1,10 @@
 [PreviousLibFiles]
-LibFiles=Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;Drivers/CMSIS/Include/core_cm7.h;Drivers/CMSIS/Include/tz_context.h;Drivers/CMSIS/Include/core_cm3.h;Drivers/CMSIS/Include/cmsis_compiler.h;Drivers/CMSIS/Include/cmsis_armclang.h;Drivers/CMSIS/Include/mpu_armv7.h;Drivers/CMSIS/Include/cmsis_armcc.h;Drivers/CMSIS/Include/core_cm4.h;Drivers/CMSIS/Include/core_cm0.h;Drivers/CMSIS/Include/cmsis_iccarm.h;Drivers/CMSIS/Include/core_armv8mml.h;Drivers/CMSIS/Include/core_sc000.h;Drivers/CMSIS/Include/core_cm1.h;Drivers/CMSIS/Include/mpu_armv8.h;Drivers/CMSIS/Include/core_sc300.h;Drivers/CMSIS/Include/cmsis_gcc.h;Drivers/CMSIS/Include/cmsis_version.h;Drivers/CMSIS/Include/core_cm23.h;Drivers/CMSIS/Include/core_cm33.h;Drivers/CMSIS/Include/core_cm0plus.h;Drivers/CMSIS/Include/core_armv8mbl.h;
+LibFiles=Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_bus.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_system.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_utils.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;Drivers/CMSIS/Include/core_cm7.h;Drivers/CMSIS/Include/tz_context.h;Drivers/CMSIS/Include/core_cm3.h;Drivers/CMSIS/Include/cmsis_compiler.h;Drivers/CMSIS/Include/cmsis_armclang.h;Drivers/CMSIS/Include/mpu_armv7.h;Drivers/CMSIS/Include/cmsis_armcc.h;Drivers/CMSIS/Include/core_cm4.h;Drivers/CMSIS/Include/core_cm0.h;Drivers/CMSIS/Include/cmsis_iccarm.h;Drivers/CMSIS/Include/core_armv8mml.h;Drivers/CMSIS/Include/core_sc000.h;Drivers/CMSIS/Include/core_cm1.h;Drivers/CMSIS/Include/mpu_armv8.h;Drivers/CMSIS/Include/core_sc300.h;Drivers/CMSIS/Include/cmsis_gcc.h;Drivers/CMSIS/Include/cmsis_version.h;Drivers/CMSIS/Include/core_cm23.h;Drivers/CMSIS/Include/core_cm33.h;Drivers/CMSIS/Include/core_cm0plus.h;Drivers/CMSIS/Include/core_armv8mbl.h;
 
 [PreviousUsedCubeIDEFiles]
 SourceFiles=Core/Src/main.c;Core/Src/gpio.c;Core/Src/i2c.c;Core/Src/spi.c;Core/Src/usart.c;Core/Src/stm32f1xx_it.c;Core/Src/stm32f1xx_hal_msp.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;Core/Src/system_stm32f1xx.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;Core/Src/system_stm32f1xx.c;;;
 HeaderPath=Drivers/STM32F1xx_HAL_Driver/Inc;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;Drivers/CMSIS/Device/ST/STM32F1xx/Include;Drivers/CMSIS/Include;Core/Inc;
-CDefines=USE_HAL_DRIVER;STM32F103x6;USE_HAL_DRIVER;USE_HAL_DRIVER;
+CDefines=USE_HAL_DRIVER;STM32F103xB;USE_HAL_DRIVER;USE_HAL_DRIVER;
 
 [PreviousGenFiles]
 AdvancedFolderStructure=true
diff --git a/.osx.project b/.osx.project
new file mode 100644
index 0000000..e69de29
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de18bd4..e51a64f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,13 +49,13 @@ else ()
     add_compile_options(-Og -g)
 endif ()
 
-include_directories(Core/Inc Drivers/STM32F1xx_HAL_Driver/Inc/Legacy Drivers/STM32F1xx_HAL_Driver/Inc Drivers/CMSIS/Device/ST/STM32F1xx/Include Drivers/CMSIS/Include)
+include_directories(Core/Inc Drivers/STM32F1xx_HAL_Driver/Inc/Legacy Drivers/STM32F1xx_HAL_Driver/Inc Drivers/CMSIS/Device/ST/STM32F1xx/Include Drivers/CMSIS/Include Core/Inc Drivers/STM32F1xx_HAL_Driver/Inc Drivers/STM32F1xx_HAL_Driver/Inc/Legacy Drivers/CMSIS/Device/ST/STM32F1xx/Include Drivers/CMSIS/Include)
 
-add_definitions(-DDEBUG -DUSE_HAL_DRIVER -DSTM32F103x6)
+add_definitions(-DDEBUG -DUSE_HAL_DRIVER -DSTM32F103xB -DDEBUG -DUSE_HAL_DRIVER -DSTM32F103xB)
 
-file(GLOB_RECURSE SOURCES "Core/*.*" "Drivers/*.*")
+file(GLOB_RECURSE SOURCES "Core/*.*" "Drivers/*.*" "Core/*.*" "Drivers/*.*")
 
-set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/STM32F103C6TX_FLASH.ld)
+set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/STM32F103C8TX_FLASH.ld)
 
 add_link_options(-Wl,-gc-sections,--print-memory-usage,-Map=${PROJECT_BINARY_DIR}/${PROJECT_NAME}.map)
 add_link_options(-mcpu=cortex-m3 -mthumb -mthumb-interwork)
diff --git a/Core/Inc/MqttKit.h b/Core/Inc/MqttKit.h
new file mode 100644
index 0000000..8432e90
--- /dev/null
+++ b/Core/Inc/MqttKit.h
@@ -0,0 +1,183 @@
+#ifndef _MQTTKIT_H_
+#define _MQTTKIT_H_
+
+
+#include "MqttKit/Common.h"
+
+
+//=============================配置==============================
+//===========可以提供RTOS的内存管理方案，也可以使用C库的=========
+//RTOS
+#include <stdlib.h>
+
+#define MQTT_MallocBuffer	malloc
+
+#define MQTT_FreeBuffer		free
+//==========================================================
+
+
+#define MOSQ_MSB(A)         (uint8)((A & 0xFF00) >> 8)
+#define MOSQ_LSB(A)         (uint8)(A & 0x00FF)
+
+
+/*--------------------------------内存分配方案标志--------------------------------*/
+#define MEM_FLAG_NULL		0
+#define MEM_FLAG_ALLOC		1
+#define MEM_FLAG_STATIC		2
+
+
+typedef struct Buffer
+{
+
+	uint8	*_data;		//协议数据
+
+	uint32	_len;		//写入的数据长度
+
+	uint32	_size;		//缓存总大小
+
+	uint8	_memFlag;	//内存使用的方案：0-未分配	1-使用的动态分配		2-使用的固定内存
+
+} MQTT_PACKET_STRUCTURE;
+
+
+/*--------------------------------固定头部消息类型--------------------------------*/
+enum MqttPacketType
+{
+
+    MQTT_PKT_CONNECT = 1, /**< 连接请求数据包 */
+    MQTT_PKT_CONNACK,     /**< 连接确认数据包 */
+    MQTT_PKT_PUBLISH,     /**< 发布数据数据包 */
+    MQTT_PKT_PUBACK,      /**< 发布确认数据包 */
+    MQTT_PKT_PUBREC,      /**< 发布数据已接收数据包，Qos 2时，回复MQTT_PKT_PUBLISH */
+    MQTT_PKT_PUBREL,      /**< 发布数据释放数据包， Qos 2时，回复MQTT_PKT_PUBREC */
+    MQTT_PKT_PUBCOMP,     /**< 发布完成数据包， Qos 2时，回复MQTT_PKT_PUBREL */
+    MQTT_PKT_SUBSCRIBE,   /**< 订阅数据包 */
+    MQTT_PKT_SUBACK,      /**< 订阅确认数据包 */
+    MQTT_PKT_UNSUBSCRIBE, /**< 取消订阅数据包 */
+    MQTT_PKT_UNSUBACK,    /**< 取消订阅确认数据包 */
+    MQTT_PKT_PINGREQ,     /**< ping 数据包 */
+    MQTT_PKT_PINGRESP,    /**< ping 响应数据包 */
+    MQTT_PKT_DISCONNECT,  /**< 断开连接数据包 */
+
+	//新增
+
+	MQTT_PKT_CMD  		 /**< 命令下发数据包 */
+
+};
+
+
+/*--------------------------------MQTT QOS等级--------------------------------*/
+enum MqttQosLevel
+{
+
+    MQTT_QOS_LEVEL0,  /**< 最多发送一次 */
+    MQTT_QOS_LEVEL1,  /**< 最少发送一次  */
+    MQTT_QOS_LEVEL2   /**< 只发送一次 */
+
+};
+
+
+/*--------------------------------MQTT 连接请求标志位，内部使用--------------------------------*/
+enum MqttConnectFlag
+{
+
+    MQTT_CONNECT_CLEAN_SESSION  = 0x02,
+    MQTT_CONNECT_WILL_FLAG      = 0x04,
+    MQTT_CONNECT_WILL_QOS0      = 0x00,
+    MQTT_CONNECT_WILL_QOS1      = 0x08,
+    MQTT_CONNECT_WILL_QOS2      = 0x10,
+    MQTT_CONNECT_WILL_RETAIN    = 0x20,
+    MQTT_CONNECT_PASSWORD       = 0x40,
+    MQTT_CONNECT_USER_NAME      = 0x80
+
+};
+
+
+/*--------------------------------消息的packet ID，可自定义--------------------------------*/
+#define MQTT_PUBLISH_ID			10
+
+#define MQTT_SUBSCRIBE_ID		20
+
+#define MQTT_UNSUBSCRIBE_ID		30
+
+
+/*--------------------------------删包--------------------------------*/
+void MQTT_DeleteBuffer(MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------解包--------------------------------*/
+uint8 MQTT_UnPacketRecv(uint8 *dataPtr);
+
+/*--------------------------------登录组包--------------------------------*/
+uint8 MQTT_PacketConnect(const int8 *user, const int8 *password, const int8 *devid,
+						uint16 cTime, uint1 clean_session, uint1 qos,
+						const int8 *will_topic, const int8 *will_msg, int32 will_retain,
+						MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------断开连接组包--------------------------------*/
+uint1 MQTT_PacketDisConnect(MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------连接响应解包--------------------------------*/
+uint8 MQTT_UnPacketConnectAck(uint8 *rev_data);
+
+/*--------------------------------数据点上传组包--------------------------------*/
+uint1 MQTT_PacketSaveData(const int8 *devid, int16 send_len, int8 *type_bin_head, uint8 type, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------二进制文件上传组包--------------------------------*/
+uint1 MQTT_PacketSaveBinData(const int8 *name, int16 file_len, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------命令下发解包--------------------------------*/
+uint8 MQTT_UnPacketCmd(uint8 *rev_data, int8 **cmdid, int8 **req, uint16 *req_len);
+
+/*--------------------------------命令回复组包--------------------------------*/
+uint1 MQTT_PacketCmdResp(const int8 *cmdid, const int8 *req, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------订阅主题组包--------------------------------*/
+uint8 MQTT_PacketSubscribe(uint16 pkt_id, enum MqttQosLevel qos, const int8 *topics[], uint8 topics_cnt, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------订阅主题回复解包--------------------------------*/
+uint8 MQTT_UnPacketSubscribe(uint8 *rev_data);
+
+/*--------------------------------取消订阅组包--------------------------------*/
+uint8 MQTT_PacketUnSubscribe(uint16 pkt_id, const int8 *topics[], uint8 topics_cnt, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------取消订阅回复解包--------------------------------*/
+uint1 MQTT_UnPacketUnSubscribe(uint8 *rev_data);
+
+/*--------------------------------发布主题组包--------------------------------*/
+uint8 MQTT_PacketPublish(uint16 pkt_id, const int8 *topic,
+						const int8 *payload, uint32 payload_len,
+						enum MqttQosLevel qos, int32 retain, int32 own,
+						MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------发布消息回复解包--------------------------------*/
+uint8 MQTT_UnPacketPublish(uint8 *rev_data, int8 **topic, uint16 *topic_len, int8 **payload, uint16 *payload_len, uint8 *qos, uint16 *pkt_id);
+
+/*--------------------------------发布消息的Ack组包--------------------------------*/
+uint1 MQTT_PacketPublishAck(uint16 pkt_id, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------发布消息的Ack解包--------------------------------*/
+uint1 MQTT_UnPacketPublishAck(uint8 *rev_data);
+
+/*--------------------------------发布消息的Rec组包--------------------------------*/
+uint1 MQTT_PacketPublishRec(uint16 pkt_id, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------发布消息的Rec解包--------------------------------*/
+uint1 MQTT_UnPacketPublishRec(uint8 *rev_data);
+
+/*--------------------------------发布消息的Rel组包--------------------------------*/
+uint1 MQTT_PacketPublishRel(uint16 pkt_id, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------发布消息的Rel解包--------------------------------*/
+uint1 MQTT_UnPacketPublishRel(uint8 *rev_data, uint16 pkt_id);
+
+/*--------------------------------发布消息的Comp组包--------------------------------*/
+uint1 MQTT_PacketPublishComp(uint16 pkt_id, MQTT_PACKET_STRUCTURE *mqttPacket);
+
+/*--------------------------------发布消息的Comp解包--------------------------------*/
+uint1 MQTT_UnPacketPublishComp(uint8 *rev_data);
+
+/*--------------------------------心跳请求组包--------------------------------*/
+uint1 MQTT_PacketPing(MQTT_PACKET_STRUCTURE *mqttPacket);
+
+
+#endif
diff --git a/Core/Inc/MqttKit/common.h b/Core/Inc/MqttKit/common.h
new file mode 100644
index 0000000..fe06b19
--- /dev/null
+++ b/Core/Inc/MqttKit/common.h
@@ -0,0 +1,17 @@
+#ifndef __COMMON_H__
+#define __COMMON_H__
+
+/*---------------------------------------------------------------------------*/
+/* Type Definition Macros                                                    */
+/*---------------------------------------------------------------------------*/
+
+typedef _Bool			uint1;
+typedef unsigned char   uint8;
+typedef char			int8;
+typedef unsigned short  uint16;
+typedef short			int16;
+typedef unsigned int    uint32;
+typedef int				int32;
+typedef unsigned int	size_t;
+
+#endif /* __COMMON_H__ */
diff --git a/Core/Inc/OneNet.h b/Core/Inc/OneNet.h
new file mode 100644
index 0000000..6231007
--- /dev/null
+++ b/Core/Inc/OneNet.h
@@ -0,0 +1,15 @@
+#ifndef _ONENET_H_
+#define _ONENET_H_
+
+
+_Bool OneNet_DevLink(void);
+
+void OneNet_SendData(void);
+
+void OneNet_RevPro(unsigned char* cmd);
+
+void OneNET_Subscribe(void);
+
+uint8_t onenet_state();
+
+#endif
diff --git a/Core/Inc/esp8266.h b/Core/Inc/esp8266.h
new file mode 100644
index 0000000..822bec5
--- /dev/null
+++ b/Core/Inc/esp8266.h
@@ -0,0 +1,18 @@
+#ifndef _ESP8266_H_
+#define _ESP8266_H_
+
+
+#define REV_OK		0	//接收完成标志
+#define REV_WAIT	1	//接收未完成标志
+
+
+void ESP8266_Init(void);
+
+void ESP8266_Clear(void);
+
+void ESP8266_SendData(unsigned char* data, unsigned short len);
+
+unsigned char* ESP8266_GetIPD(unsigned short timeOut);
+
+
+#endif
diff --git a/Core/Inc/stm32f1xx_it.h b/Core/Inc/stm32f1xx_it.h
index 6762be3..ef0eb5f 100644
--- a/Core/Inc/stm32f1xx_it.h
+++ b/Core/Inc/stm32f1xx_it.h
@@ -56,6 +56,8 @@ void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
 void EXTI9_5_IRQHandler(void);
+void USART1_IRQHandler(void);
+void USART2_IRQHandler(void);
 void EXTI15_10_IRQHandler(void);
 /* USER CODE BEGIN EFP */
 
diff --git a/Core/Src/MqttKit.c b/Core/Src/MqttKit.c
new file mode 100644
index 0000000..98b5dc6
--- /dev/null
+++ b/Core/Src/MqttKit.c
@@ -0,0 +1,1399 @@
+/**
+	************************************************************
+	************************************************************
+	************************************************************
+	*	文件名： 	MqttKit.c
+	*
+	*	作者： 		张继瑞
+	*
+	*	日期： 		2018-04-27
+	*
+	*	版本： 		V1.6
+	*
+	*	说明： 		MQTT协议
+	*
+	*	修改记录：	V1.1：解决MQTT_PacketSubscribe订阅不为2个topic
+	*						个数时协议错误的bug
+	*				V1.2：修复MQTT_PacketCmdResp的bug
+	*				V1.3：将strncpy替换为memcpy，解决潜在bug
+	*				V1.4：修复	MQTT_PacketPublishAck
+	*							MQTT_PacketPublishRel
+	*							函数封包错误的bug
+	*				V1.5：增加	MQTT_UnPacketCmd
+	*							MQTT_UnPacketPublish
+	*							接口对消息内容长度的提取参数
+	*				V1.6：增加二进制文件上传接口
+	************************************************************
+	************************************************************
+	************************************************************
+**/
+
+//协议头文件
+#include "MqttKit.h"
+
+//C库
+#include <string.h>
+#include <stdio.h>
+
+
+#define CMD_TOPIC_PREFIX		"$creq"
+
+
+//==========================================================
+//	函数名称：	EDP_NewBuffer
+//
+//	函数功能：	申请内存
+//
+//	入口参数：	edpPacket：包结构体
+//				size：大小
+//
+//	返回参数：	无
+//
+//	说明：		1.可使用动态分配来分配内存
+//				2.可使用局部或全局数组来指定内存
+//==========================================================
+void MQTT_NewBuffer(MQTT_PACKET_STRUCTURE *mqttPacket, uint32 size)
+{
+
+	uint32 i = 0;
+
+	if(mqttPacket->_data == NULL)
+	{
+		mqttPacket->_memFlag = MEM_FLAG_ALLOC;
+
+		mqttPacket->_data = (uint8 *)MQTT_MallocBuffer(size);
+		if(mqttPacket->_data != NULL)
+		{
+			mqttPacket->_len = 0;
+
+			mqttPacket->_size = size;
+
+			for(; i < mqttPacket->_size; i++)
+				mqttPacket->_data[i] = 0;
+		}
+	}
+	else
+	{
+		mqttPacket->_memFlag = MEM_FLAG_STATIC;
+
+		for(; i < mqttPacket->_size; i++)
+			mqttPacket->_data[i] = 0;
+
+		mqttPacket->_len = 0;
+
+		if(mqttPacket->_size < size)
+			mqttPacket->_data = NULL;
+	}
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_DeleteBuffer
+//
+//	函数功能：	释放数据内存
+//
+//	入口参数：	edpPacket：包结构体
+//
+//	返回参数：	无
+//
+//	说明：
+//==========================================================
+void MQTT_DeleteBuffer(MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	if(mqttPacket->_memFlag == MEM_FLAG_ALLOC)
+		MQTT_FreeBuffer(mqttPacket->_data);
+
+	mqttPacket->_data = NULL;
+	mqttPacket->_len = 0;
+	mqttPacket->_size = 0;
+	mqttPacket->_memFlag = MEM_FLAG_NULL;
+
+}
+
+int32 MQTT_DumpLength(size_t len, uint8 *buf)
+{
+
+	int32 i = 0;
+
+	for(i = 1; i <= 4; ++i)
+	{
+		*buf = len % 128;
+		len >>= 7;
+		if(len > 0)
+		{
+			*buf |= 128;
+			++buf;
+		}
+		else
+		{
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+int32 MQTT_ReadLength(const uint8 *stream, int32 size, uint32 *len)
+{
+
+	int32 i;
+	const uint8 *in = stream;
+	uint32 multiplier = 1;
+
+	*len = 0;
+	for(i = 0; i < size; ++i)
+	{
+		*len += (in[i] & 0x7f) * multiplier;
+
+		if(!(in[i] & 0x80))
+		{
+			return i + 1;
+		}
+
+		multiplier <<= 7;
+		if(multiplier >= 2097152)		//128 * *128 * *128
+		{
+			return -2;					// error, out of range
+		}
+	}
+
+	return -1;							// not complete
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketRecv
+//
+//	函数功能：	MQTT数据接收类型判断
+//
+//	入口参数：	dataPtr：接收的数据指针
+//
+//	返回参数：	0-成功		其他-失败原因
+//
+//	说明：
+//==========================================================
+uint8 MQTT_UnPacketRecv(uint8 *dataPtr)
+{
+
+	uint8 status = 255;
+	uint8 type = dataPtr[0] >> 4;				//类型检查
+
+	if(type < 1 || type > 14)
+		return status;
+
+	if(type == MQTT_PKT_PUBLISH)
+	{
+		uint8 *msgPtr;
+		uint32 remain_len = 0;
+
+		msgPtr = dataPtr + MQTT_ReadLength(dataPtr + 1, 4, &remain_len) + 1;
+
+		if(remain_len < 2 || dataPtr[0] & 0x01)					//retain
+			return 255;
+
+		if(remain_len < ((uint16)msgPtr[0] << 8 | msgPtr[1]) + 2)
+			return 255;
+
+		if(strstr((int8 *)msgPtr + 2, CMD_TOPIC_PREFIX) != NULL)	//如果是命令下发
+			status = MQTT_PKT_CMD;
+		else
+			status = MQTT_PKT_PUBLISH;
+	}
+	else
+		status = type;
+
+	return status;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketConnect
+//
+//	函数功能：	连接消息组包
+//
+//	入口参数：	user：用户名：产品ID
+//				password：密码：鉴权信息或apikey
+//				devid：设备ID
+//				cTime：连接保持时间
+//				clean_session：离线消息清除标志
+//				qos：重发标志
+//				will_topic：异常离线topic
+//				will_msg：异常离线消息
+//				will_retain：消息推送标志
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		其他-失败
+//
+//	说明：
+//==========================================================
+uint8 MQTT_PacketConnect(const int8 *user, const int8 *password, const int8 *devid,
+						uint16 cTime, uint1 clean_session, uint1 qos,
+						const int8 *will_topic, const int8 *will_msg, int32 will_retain,
+						MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	uint8 flags = 0;
+	uint8 will_topic_len = 0;
+	uint16 total_len = 15;
+	int16 len = 0, devid_len = strlen(devid);
+
+	if(!devid)
+		return 1;
+
+	total_len += devid_len + 2;
+
+	//断线后，是否清理离线消息：1-清理	0-不清理--------------------------------------------
+	if(clean_session)
+	{
+		flags |= MQTT_CONNECT_CLEAN_SESSION;
+	}
+
+	//异常掉线情况下，服务器发布的topic------------------------------------------------------
+	if(will_topic)
+	{
+		flags |= MQTT_CONNECT_WILL_FLAG;
+		will_topic_len = strlen(will_topic);
+		total_len += 4 + will_topic_len + strlen(will_msg);
+	}
+
+	//qos级别--主要用于PUBLISH（发布态）消息的，保证消息传递的次数-----------------------------
+	switch((unsigned char)qos)
+	{
+		case MQTT_QOS_LEVEL0:
+			flags |= MQTT_CONNECT_WILL_QOS0;							//最多一次
+		break;
+
+		case MQTT_QOS_LEVEL1:
+			flags |= (MQTT_CONNECT_WILL_FLAG | MQTT_CONNECT_WILL_QOS1);	//最少一次
+		break;
+
+		case MQTT_QOS_LEVEL2:
+			flags |= (MQTT_CONNECT_WILL_FLAG | MQTT_CONNECT_WILL_QOS2);	//只有一次
+		break;
+
+		default:
+		return 2;
+	}
+
+	//主要用于PUBLISH(发布态)的消息，表示服务器要保留这次推送的信息，如果有新的订阅者出现，就把这消息推送给它。如果不设那么推送至当前订阅的就释放了
+	if(will_retain)
+	{
+		flags |= (MQTT_CONNECT_WILL_FLAG | MQTT_CONNECT_WILL_RETAIN);
+	}
+
+	//账号为空 密码为空---------------------------------------------------------------------
+	if(!user || !password)
+	{
+		return 3;
+	}
+	flags |= MQTT_CONNECT_USER_NAME | MQTT_CONNECT_PASSWORD;
+
+	total_len += strlen(user) + strlen(password) + 4;
+
+	//分配内存-----------------------------------------------------------------------------
+	MQTT_NewBuffer(mqttPacket, total_len);
+	if(mqttPacket->_data == NULL)
+		return 4;
+
+	memset(mqttPacket->_data, 0, total_len);
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------连接请求类型---------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_CONNECT << 4;
+
+	//固定头部----------------------剩余长度值-----------------------------------------------
+	len = MQTT_DumpLength(total_len - 5, mqttPacket->_data + mqttPacket->_len);
+	if(len < 0)
+	{
+		MQTT_DeleteBuffer(mqttPacket);
+		return 5;
+	}
+	else
+		mqttPacket->_len += len;
+
+/*************************************可变头部***********************************************/
+
+	//可变头部----------------------协议名长度 和 协议名--------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = 0;
+	mqttPacket->_data[mqttPacket->_len++] = 4;
+	mqttPacket->_data[mqttPacket->_len++] = 'M';
+	mqttPacket->_data[mqttPacket->_len++] = 'Q';
+	mqttPacket->_data[mqttPacket->_len++] = 'T';
+	mqttPacket->_data[mqttPacket->_len++] = 'T';
+
+	//可变头部----------------------protocol level 4-----------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = 4;
+
+	//可变头部----------------------连接标志(该函数开头处理的数据)-----------------------------
+    mqttPacket->_data[mqttPacket->_len++] = flags;
+
+	//可变头部----------------------保持连接的时间(秒)----------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(cTime);
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(cTime);
+
+/*************************************消息体************************************************/
+
+	//消息体----------------------------devid长度、devid-------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(devid_len);
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(devid_len);
+
+	strncat((int8 *)mqttPacket->_data + mqttPacket->_len, devid, devid_len);
+	mqttPacket->_len += devid_len;
+
+	//消息体----------------------------will_flag 和 will_msg---------------------------------
+	if(flags & MQTT_CONNECT_WILL_FLAG)
+	{
+		unsigned short mLen = 0;
+
+		if(!will_msg)
+			will_msg = "";
+
+		mLen = strlen(will_topic);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(mLen);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(mLen);
+		strncat((int8 *)mqttPacket->_data + mqttPacket->_len, will_topic, mLen);
+		mqttPacket->_len += mLen;
+
+		mLen = strlen(will_msg);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(mLen);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(mLen);
+		strncat((int8 *)mqttPacket->_data + mqttPacket->_len, will_msg, mLen);
+		mqttPacket->_len += mLen;
+	}
+
+	//消息体----------------------------use---------------------------------------------------
+	if(flags & MQTT_CONNECT_USER_NAME)
+	{
+		unsigned short user_len = strlen(user);
+
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(user_len);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(user_len);
+		strncat((int8 *)mqttPacket->_data + mqttPacket->_len, user, user_len);
+		mqttPacket->_len += user_len;
+	}
+
+	//消息体----------------------------password----------------------------------------------
+	if(flags & MQTT_CONNECT_PASSWORD)
+	{
+		unsigned short psw_len = strlen(password);
+
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(psw_len);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(psw_len);
+		strncat((int8 *)mqttPacket->_data + mqttPacket->_len, password, psw_len);
+		mqttPacket->_len += psw_len;
+	}
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketDisConnect
+//
+//	函数功能：	断开连接消息组包
+//
+//	入口参数：	mqttPacket：包指针
+//
+//	返回参数：	0-成功		1-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_PacketDisConnect(MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	MQTT_NewBuffer(mqttPacket, 2);
+	if(mqttPacket->_data == NULL)
+		return 1;
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_DISCONNECT << 4;
+
+	//固定头部----------------------剩余长度值-----------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = 0;
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketConnectAck
+//
+//	函数功能：	连接消息解包
+//
+//	入口参数：	rev_data：接收的数据
+//
+//	返回参数：	1、255-失败		其他-平台的返回码
+//
+//	说明：
+//==========================================================
+uint8 MQTT_UnPacketConnectAck(uint8 *rev_data)
+{
+
+	if(rev_data[1] != 2)
+		return 1;
+
+	if(rev_data[2] == 0 || rev_data[2] == 1)
+		return rev_data[3];
+	else
+		return 255;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketSaveData
+//
+//	函数功能：	数据点上传组包
+//
+//	入口参数：	devid：设备ID(可为空)
+//				send_buf：json缓存buf
+//				send_len：json总长
+//				type_bin_head：bin文件的消息头
+//				type：类型
+//
+//	返回参数：	0-成功		1-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_PacketSaveData(const int8 *devid, int16 send_len, int8 *type_bin_head, uint8 type, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+ char topic[64];
+ snprintf(topic, sizeof(topic), "$sys/zzS53oqy5l/%s/thing/property/post", devid);
+ //
+	// printf(topic);
+ //
+	// if(MQTT_PacketPublish(MQTT_PUBLISH_ID, topic, NULL, send_len + 3, MQTT_QOS_LEVEL1, 0, 1, mqttPacket) == 0)
+	// {
+	// 	mqttPacket->_data[mqttPacket->_len++] = type;					//类型
+ //
+	// 	mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(send_len);
+	// 	mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(send_len);
+	// }
+	// else
+	// 	return 1;
+ //
+	// return 0;
+	if(MQTT_PacketPublish(MQTT_PUBLISH_ID, topic, NULL, send_len, MQTT_QOS_LEVEL1, 0, 1, mqttPacket) == 0)  //Publish消息
+	{
+
+	}
+	else
+		return 1;
+
+	return 0;
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketSaveBinData
+//
+//	函数功能：	为禁止文件上传组包
+//
+//	入口参数：	name：数据流名字
+//				file_len：文件长度
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		1-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_PacketSaveBinData(const int8 *name, int16 file_len, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	uint1 result = 1;
+	int8 *bin_head = NULL;
+	uint8 bin_head_len = 0;
+	int8 *payload = NULL;
+	int32 payload_size = 0;
+
+	bin_head = (int8 *)MQTT_MallocBuffer(13 + strlen(name));
+	if(bin_head == NULL)
+		return result;
+
+	sprintf(bin_head, "{\"ds_id\":\"%s\"}", name);
+
+	bin_head_len = strlen(bin_head);
+	payload_size = 7 + bin_head_len + file_len;
+
+	payload = (int8 *)MQTT_MallocBuffer(payload_size - file_len);
+	if(payload == NULL)
+	{
+		MQTT_FreeBuffer(bin_head);
+
+		return result;
+	}
+
+	payload[0] = 2;						//类型
+
+	payload[1] = MOSQ_MSB(bin_head_len);
+	payload[2] = MOSQ_LSB(bin_head_len);
+
+	memcpy(payload + 3, bin_head, bin_head_len);
+
+	payload[bin_head_len + 3] = (file_len >> 24) & 0xFF;
+	payload[bin_head_len + 4] = (file_len >> 16) & 0xFF;
+	payload[bin_head_len + 5] = (file_len >> 8) & 0xFF;
+	payload[bin_head_len + 6] = file_len & 0xFF;
+
+	if(MQTT_PacketPublish(MQTT_PUBLISH_ID, "$dp", payload, payload_size, MQTT_QOS_LEVEL1, 0, 1, mqttPacket) == 0)
+		result = 0;
+
+	MQTT_FreeBuffer(bin_head);
+	MQTT_FreeBuffer(payload);
+
+	return result;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketCmd
+//
+//	函数功能：	命令下发解包
+//
+//	入口参数：	rev_data：接收的数据指针
+//				cmdid：cmdid-uuid
+//				req：命令
+//
+//	返回参数：	0-成功		其他-失败原因
+//
+//	说明：
+//==========================================================
+uint8 MQTT_UnPacketCmd(uint8 *rev_data, int8 **cmdid, int8 **req, uint16 *req_len)
+{
+
+	int8 *dataPtr = strchr((int8 *)rev_data + 6, '/');	//加6是跳过头信息
+
+	uint32 remain_len = 0;
+
+	if(dataPtr == NULL)									//未找到'/'
+		return 1;
+	dataPtr++;											//跳过'/'
+
+	MQTT_ReadLength(rev_data + 1, 4, &remain_len);		//读取剩余字节
+
+	*cmdid = (int8 *)MQTT_MallocBuffer(37);				//cmdid固定36字节，多分配一个结束符的位置
+	if(*cmdid == NULL)
+		return 2;
+
+	memset(*cmdid, 0, 37);								//全部清零
+	memcpy(*cmdid, (const int8 *)dataPtr, 36);			//复制cmdid
+	dataPtr += 36;
+
+	*req_len = remain_len - 44;							//命令长度 = 剩余长度(remain_len) - 2 - 5($creq) - 1(\) - cmdid长度
+	*req = (int8 *)MQTT_MallocBuffer(*req_len + 1);		//分配命令长度+1
+	if(*req == NULL)
+	{
+		MQTT_FreeBuffer(*cmdid);
+		return 3;
+	}
+
+	memset(*req, 0, *req_len + 1);						//清零
+	memcpy(*req, (const int8 *)dataPtr, *req_len);		//复制命令
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketCmdResp
+//
+//	函数功能：	命令回复组包
+//
+//	入口参数：	cmdid：cmdid
+//				req：命令
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		1-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_PacketCmdResp(const int8 *cmdid, const int8 *req, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	uint16 cmdid_len = strlen(cmdid);
+	uint16 req_len = strlen(req);
+	_Bool status = 0;
+
+	int8 *payload = MQTT_MallocBuffer(cmdid_len + 7);
+	if(payload == NULL)
+		return 1;
+
+	memset(payload, 0, cmdid_len + 7);
+	memcpy(payload, "$crsp/", 6);
+	strncat(payload, cmdid, cmdid_len);
+
+	if(MQTT_PacketPublish(MQTT_PUBLISH_ID, payload, req, strlen(req), MQTT_QOS_LEVEL0, 0, 1, mqttPacket) == 0)
+		status = 0;
+	else
+		status = 1;
+
+	MQTT_FreeBuffer(payload);
+
+	return status;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketSubscribe
+//
+//	函数功能：	Subscribe消息组包
+//
+//	入口参数：	pkt_id：pkt_id
+//				qos：消息重发次数
+//				topics：订阅的消息
+//				topics_cnt：订阅的消息个数
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		其他-失败
+//
+//	说明：
+//==========================================================
+uint8 MQTT_PacketSubscribe(uint16 pkt_id, enum MqttQosLevel qos, const int8 *topics[], uint8 topics_cnt, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	uint32 topic_len = 0, remain_len = 0;
+	int16 len = 0;
+	uint8 i = 0;
+
+	if(pkt_id == 0)
+		return 1;
+
+	//计算topic长度-------------------------------------------------------------------------
+	for(; i < topics_cnt; i++)
+	{
+		if(topics[i] == NULL)
+			return 2;
+
+		topic_len += strlen(topics[i]);
+	}
+
+	//2 bytes packet id + topic filter(2 bytes topic + topic length + 1 byte reserve)------
+	remain_len = 2 + 3 * topics_cnt + topic_len;
+
+	//分配内存------------------------------------------------------------------------------
+	MQTT_NewBuffer(mqttPacket, remain_len + 5);
+	if(mqttPacket->_data == NULL)
+		return 3;
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_SUBSCRIBE << 4 | 0x02;
+
+	//固定头部----------------------剩余长度值-----------------------------------------------
+	len = MQTT_DumpLength(remain_len, mqttPacket->_data + mqttPacket->_len);
+	if(len < 0)
+	{
+		MQTT_DeleteBuffer(mqttPacket);
+		return 4;
+	}
+	else
+		mqttPacket->_len += len;
+
+/*************************************payload***********************************************/
+
+	//payload----------------------pkt_id---------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(pkt_id);
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(pkt_id);
+
+	//payload----------------------topic_name-----------------------------------------------
+	for(i = 0; i < topics_cnt; i++)
+	{
+		topic_len = strlen(topics[i]);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(topic_len);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(topic_len);
+
+		strncat((int8 *)mqttPacket->_data + mqttPacket->_len, topics[i], topic_len);
+		mqttPacket->_len += topic_len;
+
+		mqttPacket->_data[mqttPacket->_len++] = qos & 0xFF;
+	}
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketSubscrebe
+//
+//	函数功能：	Subscribe的回复消息解包
+//
+//	入口参数：	rev_data：接收到的信息
+//
+//	返回参数：	0-成功		其他-失败
+//
+//	说明：
+//==========================================================
+uint8 MQTT_UnPacketSubscribe(uint8 *rev_data)
+{
+
+	uint8 result = 255;
+
+	if(rev_data[2] == MOSQ_MSB(MQTT_SUBSCRIBE_ID) && rev_data[3] == MOSQ_LSB(MQTT_SUBSCRIBE_ID))
+	{
+		switch(rev_data[4])
+		{
+			case 0x00:
+			case 0x01:
+			case 0x02:
+				//MQTT Subscribe OK
+				result = 0;
+			break;
+
+			case 0x80:
+				//MQTT Subscribe Failed
+				result = 1;
+			break;
+
+			default:
+				//MQTT Subscribe UnKnown Err
+				result = 2;
+			break;
+		}
+	}
+
+	return result;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketUnSubscribe
+//
+//	函数功能：	UnSubscribe消息组包
+//
+//	入口参数：	pkt_id：pkt_id
+//				qos：消息重发次数
+//				topics：订阅的消息
+//				topics_cnt：订阅的消息个数
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		其他-失败
+//
+//	说明：
+//==========================================================
+uint8 MQTT_PacketUnSubscribe(uint16 pkt_id, const int8 *topics[], uint8 topics_cnt, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	uint32 topic_len = 0, remain_len = 0;
+	int16 len = 0;
+	uint8 i = 0;
+
+	if(pkt_id == 0)
+		return 1;
+
+	//计算topic长度-------------------------------------------------------------------------
+	for(; i < topics_cnt; i++)
+	{
+		if(topics[i] == NULL)
+			return 2;
+
+		topic_len += strlen(topics[i]);
+	}
+
+	//2 bytes packet id, 2 bytes topic length + topic + 1 byte reserve---------------------
+	remain_len = 2 + (topics_cnt << 1) + topic_len;
+
+	//分配内存------------------------------------------------------------------------------
+	MQTT_NewBuffer(mqttPacket, remain_len + 5);
+	if(mqttPacket->_data == NULL)
+		return 3;
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_UNSUBSCRIBE << 4 | 0x02;
+
+	//固定头部----------------------剩余长度值-----------------------------------------------
+	len = MQTT_DumpLength(remain_len, mqttPacket->_data + mqttPacket->_len);
+	if(len < 0)
+	{
+		MQTT_DeleteBuffer(mqttPacket);
+		return 4;
+	}
+	else
+		mqttPacket->_len += len;
+
+/*************************************payload***********************************************/
+
+	//payload----------------------pkt_id---------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(pkt_id);
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(pkt_id);
+
+	//payload----------------------topic_name-----------------------------------------------
+	for(i = 0; i < topics_cnt; i++)
+	{
+		topic_len = strlen(topics[i]);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(topic_len);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(topic_len);
+
+		strncat((int8 *)mqttPacket->_data + mqttPacket->_len, topics[i], topic_len);
+		mqttPacket->_len += topic_len;
+	}
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketUnSubscribe
+//
+//	函数功能：	UnSubscribe的回复消息解包
+//
+//	入口参数：	rev_data：接收到的信息
+//
+//	返回参数：	0-成功		其他-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_UnPacketUnSubscribe(uint8 *rev_data)
+{
+
+	uint1 result = 1;
+
+	if(rev_data[2] == MOSQ_MSB(MQTT_UNSUBSCRIBE_ID) && rev_data[3] == MOSQ_LSB(MQTT_UNSUBSCRIBE_ID))
+	{
+		result = 0;
+	}
+
+	return result;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketPublish
+//
+//	函数功能：	Pulish消息组包
+//
+//	入口参数：	pkt_id：pkt_id
+//				topic：发布的topic
+//				payload：消息体
+//				payload_len：消息体长度
+//				qos：重发次数
+//				retain：离线消息推送
+//				own：
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		其他-失败
+//
+//	说明：
+//==========================================================
+uint8 MQTT_PacketPublish(uint16 pkt_id, const int8 *topic,
+						const int8 *payload, uint32 payload_len,
+						enum MqttQosLevel qos, int32 retain, int32 own,
+						MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	uint32 total_len = 0, topic_len = 0;
+	uint32 data_len = 0;
+	int32 len = 0;
+	uint8 flags = 0;
+
+	//pkt_id检查----------------------------------------------------------------------------
+	if(pkt_id == 0)
+		return 1;
+
+	//$dp为系统上传数据点的指令--------------------------------------------------------------
+	for(topic_len = 0; topic[topic_len] != '\0'; ++topic_len)
+	{
+		if((topic[topic_len] == '#') || (topic[topic_len] == '+'))
+			return 2;
+	}
+
+	//Publish消息---------------------------------------------------------------------------
+	flags |= MQTT_PKT_PUBLISH << 4;
+
+	//retain标志----------------------------------------------------------------------------
+	if(retain)
+		flags |= 0x01;
+
+	//总长度--------------------------------------------------------------------------------
+	total_len = topic_len + payload_len + 2;
+
+	//qos级别--主要用于PUBLISH（发布态）消息的，保证消息传递的次数-----------------------------
+	switch(qos)
+	{
+		case MQTT_QOS_LEVEL0:
+			flags |= MQTT_CONNECT_WILL_QOS0;	//最多一次
+		break;
+
+		case MQTT_QOS_LEVEL1:
+			flags |= 0x02;						//最少一次
+			total_len += 2;
+		break;
+
+		case MQTT_QOS_LEVEL2:
+			flags |= 0x04;						//只有一次
+			total_len += 2;
+		break;
+
+		default:
+		return 3;
+	}
+
+	//分配内存------------------------------------------------------------------------------
+	if(payload != NULL)
+	{
+		if(payload[0] == 2)
+		{
+			uint32 data_len_t = 0;
+
+			while(payload[data_len_t++] != '}');
+			data_len_t -= 3;
+			data_len = data_len_t + 7;
+			data_len_t = payload_len - data_len;
+
+			MQTT_NewBuffer(mqttPacket, total_len + 3 - data_len_t);
+
+			if(mqttPacket->_data == NULL)
+				return 4;
+
+			memset(mqttPacket->_data, 0, total_len + 3 - data_len_t);
+		}
+		else
+		{
+			MQTT_NewBuffer(mqttPacket, total_len + 3);
+
+			if(mqttPacket->_data == NULL)
+				return 4;
+
+			memset(mqttPacket->_data, 0, total_len + 3);
+		}
+	}
+	else
+	{
+		MQTT_NewBuffer(mqttPacket, total_len + 3);
+
+		if(mqttPacket->_data == NULL)
+			return 4;
+
+		memset(mqttPacket->_data, 0, total_len + 3);
+	}
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = flags;
+
+	//固定头部----------------------剩余长度值-----------------------------------------------
+	len = MQTT_DumpLength(total_len, mqttPacket->_data + mqttPacket->_len);
+	if(len < 0)
+	{
+		MQTT_DeleteBuffer(mqttPacket);
+		return 5;
+	}
+	else
+		mqttPacket->_len += len;
+
+/*************************************可变头部***********************************************/
+
+	//可变头部----------------------写入topic长度、topic-------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(topic_len);
+	mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(topic_len);
+
+	strncat((int8 *)mqttPacket->_data + mqttPacket->_len, topic, topic_len);
+	mqttPacket->_len += topic_len;
+	if(qos != MQTT_QOS_LEVEL0)
+	{
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_MSB(pkt_id);
+		mqttPacket->_data[mqttPacket->_len++] = MOSQ_LSB(pkt_id);
+	}
+
+	//可变头部----------------------写入payload----------------------------------------------
+	if(payload != NULL)
+	{
+		if(payload[0] == 2)
+		{
+			memcpy((int8 *)mqttPacket->_data + mqttPacket->_len, payload, data_len);
+			mqttPacket->_len += data_len;
+		}
+		else
+		{
+			memcpy((int8 *)mqttPacket->_data + mqttPacket->_len, payload, payload_len);
+			mqttPacket->_len += payload_len;
+		}
+	}
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketPublish
+//
+//	函数功能：	Publish消息解包
+//
+//	入口参数：	flags：MQTT相关标志信息
+//				pkt：指向可变头部
+//				size：固定头部中的剩余长度信息
+//
+//	返回参数：	0-成功		其他-失败原因
+//
+//	说明：
+//==========================================================
+uint8 MQTT_UnPacketPublish(uint8 *rev_data, int8 **topic, uint16 *topic_len, int8 **payload, uint16 *payload_len, uint8 *qos, uint16 *pkt_id)
+{
+
+	const int8 flags = rev_data[0] & 0x0F;
+	uint8 *msgPtr;
+	uint32 remain_len = 0;
+
+	const int8 dup = flags & 0x08;
+
+	*qos = (flags & 0x06) >> 1;
+
+	msgPtr = rev_data + MQTT_ReadLength(rev_data + 1, 4, &remain_len) + 1;
+
+	if(remain_len < 2 || flags & 0x01)							//retain
+		return 255;
+
+	*topic_len = (uint16)msgPtr[0] << 8 | msgPtr[1];
+	if(remain_len < *topic_len + 2)
+		return 255;
+
+	if(strstr((int8 *)msgPtr + 2, CMD_TOPIC_PREFIX) != NULL)	//如果是命令下发
+		return MQTT_PKT_CMD;
+
+	switch(*qos)
+	{
+		case MQTT_QOS_LEVEL0:									// qos0 have no packet identifier
+
+			if(0 != dup)
+				return 255;
+
+			*topic = MQTT_MallocBuffer(*topic_len + 1);			//为topic分配内存
+			if(*topic == NULL)
+				return 255;
+
+			memset(*topic, 0, *topic_len + 1);
+			memcpy(*topic, (int8 *)msgPtr + 2, *topic_len);		//复制数据
+
+			*payload_len = remain_len - 2 - *topic_len;			//为payload分配内存
+			*payload = MQTT_MallocBuffer(*payload_len + 1);
+			if(*payload == NULL)								//如果失败
+			{
+				MQTT_FreeBuffer(*topic);						//则需要把topic的内存释放掉
+				return 255;
+			}
+
+			memset(*payload, 0, *payload_len + 1);
+			memcpy(*payload, (int8 *)msgPtr + 2 + *topic_len, *payload_len);
+
+		break;
+
+		case MQTT_QOS_LEVEL1:
+		case MQTT_QOS_LEVEL2:
+
+			if(*topic_len + 2 > remain_len)
+				return 255;
+
+			*pkt_id = (uint16)msgPtr[*topic_len + 2] << 8 | msgPtr[*topic_len + 3];
+			if(pkt_id == 0)
+				return 255;
+
+			*topic = MQTT_MallocBuffer(*topic_len + 1);			//为topic分配内存
+			if(*topic == NULL)
+				return 255;
+
+			memset(*topic, 0, *topic_len + 1);
+			memcpy(*topic, (int8 *)msgPtr + 2, *topic_len);		//复制数据
+
+			*payload_len = remain_len - 4 - *topic_len;
+			*payload = MQTT_MallocBuffer(*payload_len + 1);		//为payload分配内存
+			if(*payload == NULL)								//如果失败
+			{
+				MQTT_FreeBuffer(*topic);						//则需要把topic的内存释放掉
+				return 255;
+			}
+
+			memset(*payload, 0, *payload_len + 1);
+			memcpy(*payload, (int8 *)msgPtr + 4 + *topic_len, *payload_len);
+
+		break;
+
+		default:
+			return 255;
+	}
+
+	if(strchr((int8 *)topic, '+') || strchr((int8 *)topic, '#'))
+		return 255;
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketPublishAck
+//
+//	函数功能：	Publish Ack消息组包
+//
+//	入口参数：	pkt_id：packet id
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		1-失败原因
+//
+//	说明：		当收到的Publish消息的QoS等级为1时，需要Ack回复
+//==========================================================
+uint1 MQTT_PacketPublishAck(uint16 pkt_id, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	MQTT_NewBuffer(mqttPacket, 4);
+	if(mqttPacket->_data == NULL)
+		return 1;
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_PUBACK << 4;
+
+	//固定头部----------------------剩余长度-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = 2;
+
+/*************************************可变头部***********************************************/
+
+	//可变头部----------------------pkt_id长度-----------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = pkt_id >> 8;
+	mqttPacket->_data[mqttPacket->_len++] = pkt_id & 0xff;
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketPublishAck
+//
+//	函数功能：	Publish Ack消息解包
+//
+//	入口参数：	rev_data：收到的数据
+//
+//	返回参数：	0-成功		1-失败原因
+//
+//	说明：
+//==========================================================
+uint1 MQTT_UnPacketPublishAck(uint8 *rev_data)
+{
+
+	if(rev_data[1] != 2)
+		return 1;
+
+	if(rev_data[2] == MOSQ_MSB(MQTT_PUBLISH_ID) && rev_data[3] == MOSQ_LSB(MQTT_PUBLISH_ID))
+		return 0;
+	else
+		return 1;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketPublishRec
+//
+//	函数功能：	Publish Rec消息组包
+//
+//	入口参数：	pkt_id：packet id
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		1-失败原因
+//
+//	说明：		当收到的Publish消息的QoS等级为2时，先收到rec
+//==========================================================
+uint1 MQTT_PacketPublishRec(uint16 pkt_id, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	MQTT_NewBuffer(mqttPacket, 4);
+	if(mqttPacket->_data == NULL)
+		return 1;
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_PUBREC << 4;
+
+	//固定头部----------------------剩余长度-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = 2;
+
+/*************************************可变头部***********************************************/
+
+	//可变头部----------------------pkt_id长度-----------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = pkt_id >> 8;
+	mqttPacket->_data[mqttPacket->_len++] = pkt_id & 0xff;
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketPublishRec
+//
+//	函数功能：	Publish Rec消息解包
+//
+//	入口参数：	rev_data：接收到的数据
+//
+//	返回参数：	0-成功		1-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_UnPacketPublishRec(uint8 *rev_data)
+{
+
+	if(rev_data[1] != 2)
+		return 1;
+
+	if(rev_data[2] == MOSQ_MSB(MQTT_PUBLISH_ID) && rev_data[3] == MOSQ_LSB(MQTT_PUBLISH_ID))
+		return 0;
+	else
+		return 1;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketPublishRel
+//
+//	函数功能：	Publish Rel消息组包
+//
+//	入口参数：	pkt_id：packet id
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		1-失败原因
+//
+//	说明：		当收到的Publish消息的QoS等级为2时，先收到rec，再回复rel
+//==========================================================
+uint1 MQTT_PacketPublishRel(uint16 pkt_id, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	MQTT_NewBuffer(mqttPacket, 4);
+	if(mqttPacket->_data == NULL)
+		return 1;
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_PUBREL << 4 | 0x02;
+
+	//固定头部----------------------剩余长度-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = 2;
+
+/*************************************可变头部***********************************************/
+
+	//可变头部----------------------pkt_id长度-----------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = pkt_id >> 8;
+	mqttPacket->_data[mqttPacket->_len++] = pkt_id & 0xff;
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketPublishRel
+//
+//	函数功能：	Publish Rel消息解包
+//
+//	入口参数：	rev_data：接收到的数据
+//
+//	返回参数：	0-成功		1-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_UnPacketPublishRel(uint8 *rev_data, uint16 pkt_id)
+{
+
+	if(rev_data[1] != 2)
+		return 1;
+
+	if(rev_data[2] == MOSQ_MSB(pkt_id) && rev_data[3] == MOSQ_LSB(pkt_id))
+		return 0;
+	else
+		return 1;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketPublishComp
+//
+//	函数功能：	Publish Comp消息组包
+//
+//	入口参数：	pkt_id：packet id
+//				mqttPacket：包指针
+//
+//	返回参数：	0-成功		1-失败原因
+//
+//	说明：		当收到的Publish消息的QoS等级为2时，先收到rec，再回复rel
+//==========================================================
+uint1 MQTT_PacketPublishComp(uint16 pkt_id, MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	MQTT_NewBuffer(mqttPacket, 4);
+	if(mqttPacket->_data == NULL)
+		return 1;
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_PUBCOMP << 4;
+
+	//固定头部----------------------剩余长度-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = 2;
+
+/*************************************可变头部***********************************************/
+
+	//可变头部----------------------pkt_id长度-----------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = pkt_id >> 8;
+	mqttPacket->_data[mqttPacket->_len++] = pkt_id & 0xff;
+
+	return 0;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_UnPacketPublishComp
+//
+//	函数功能：	Publish Comp消息解包
+//
+//	入口参数：	rev_data：接收到的数据
+//
+//	返回参数：	0-成功		1-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_UnPacketPublishComp(uint8 *rev_data)
+{
+
+	if(rev_data[1] != 2)
+		return 1;
+
+	if(rev_data[2] == MOSQ_MSB(MQTT_PUBLISH_ID) && rev_data[3] == MOSQ_LSB(MQTT_PUBLISH_ID))
+		return 0;
+	else
+		return 1;
+
+}
+
+//==========================================================
+//	函数名称：	MQTT_PacketPing
+//
+//	函数功能：	心跳请求组包
+//
+//	入口参数：	mqttPacket：包指针
+//
+//	返回参数：	0-成功		1-失败
+//
+//	说明：
+//==========================================================
+uint1 MQTT_PacketPing(MQTT_PACKET_STRUCTURE *mqttPacket)
+{
+
+	MQTT_NewBuffer(mqttPacket, 2);
+	if(mqttPacket->_data == NULL)
+		return 1;
+
+/*************************************固定头部***********************************************/
+
+	//固定头部----------------------头部消息-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = MQTT_PKT_PINGREQ << 4;
+
+	//固定头部----------------------剩余长度-------------------------------------------------
+	mqttPacket->_data[mqttPacket->_len++] = 0;
+
+	return 0;
+
+}
+
diff --git a/Core/Src/OneNet.c b/Core/Src/OneNet.c
new file mode 100644
index 0000000..1087490
--- /dev/null
+++ b/Core/Src/OneNet.c
@@ -0,0 +1,236 @@
+#include <string.h>
+#include <stdio.h>
+#include "esp8266.h"
+#include "main.h"
+#include "onenet.h"
+#include "mqttkit.h"
+#include "stm32f1xx_hal_gpio.h"
+// #include "main.h"
+
+#define PRODUCT_ID "zzS53oqy5l"
+#define DEVICE_ID "ESP_67EAF3"
+#define SIGNATURE "version=2018-10-31&res=products%2FzzS53oqy5l%2Fdevices%2FESP_67EAF3&et=1766658508&method=md5&sign=r2rPhQdTZ3vpkxJTbgN5NQ%3D%3D"
+
+
+extern unsigned char esp8266_buf[128];
+
+
+//==========================================================
+//	函数名称：	OneNet_DevLink
+//
+//	函数功能：	与onenet创建连接
+//
+//	入口参数：	无
+//
+//	返回参数：	1-成功	0-失败
+//
+//	说明：		与onenet平台建立连接
+//==========================================================
+_Bool OneNet_DevLink(void)
+{
+    MQTT_PACKET_STRUCTURE mqttPacket = {NULL, 0, 0, 0}; //协议包
+
+    unsigned char* dataPtr;
+
+    _Bool status = 1;
+
+    // printf("OneNet_DevLink\r\nPROID: %s\tAUIF: %s\tDEVID:%s\r\n", PRODUCT_ID, SIGNATURE, DEVICE_ID);
+
+    if (MQTT_PacketConnect(PRODUCT_ID, SIGNATURE, DEVICE_ID, 256, 1, MQTT_QOS_LEVEL0, NULL, NULL, 0, &mqttPacket) == 0)
+    {
+        ESP8266_SendData(mqttPacket._data, mqttPacket._len); //上传平台
+
+        dataPtr = ESP8266_GetIPD(250); //等待平台响应
+        if (dataPtr != NULL)
+        {
+            if (MQTT_UnPacketRecv(dataPtr) == MQTT_PKT_CONNACK)
+            {
+                switch (MQTT_UnPacketConnectAck(dataPtr))
+                {
+                case 0:
+                    status = 0;
+                    break;
+
+                // case 1: printf("WARN:	连接失败：协议错误\r\n");
+                //     break;
+                // case 2: printf("WARN:	连接失败：非法的clientid\r\n");
+                //     break;
+                // case 3: printf("WARN:	连接失败：服务器失败\r\n");
+                //     break;
+                // case 4: printf("WARN:	连接失败：用户名或密码错误\r\n");
+                //     break;
+                // case 5: printf("WARN:	连接失败：非法链接(比如token非法)\r\n");
+                //     break;
+                //
+                default:
+                    break;
+                }
+            }
+        }
+
+        MQTT_DeleteBuffer(&mqttPacket); //删包
+    }
+    // else
+    //     printf("WARN:	MQTT_PacketConnect Failed\r\n");
+
+    return status;
+}
+
+
+unsigned char OneNet_FillBuf(char* buf)
+{
+    char text[48];
+
+	strcpy(buf, "{\"id\":\"1743082944\",\"params\":{");
+
+	memset(text, 0, sizeof(text));
+	sprintf(text, "\"volt\":{\"value\":%f},", 218.3);
+	strcat(buf, text);
+
+	memset(text, 0, sizeof(text));
+	sprintf(text, "\"output\":{\"value\":%s}", HAL_GPIO_ReadPin(RELAY1_GPIO_Port, RELAY1_Pin) == GPIO_PIN_RESET ? "true" : "false");
+	strcat(buf, text);
+
+    strcat(buf, "}}");
+    return strlen(buf);
+}
+
+//==========================================================
+//	函数名称：	OneNet_SendData
+//
+//	函数功能：	上传数据到平台
+//
+//	入口参数：	type：发送数据的格式
+//
+//	返回参数：	无
+//
+//	说明：
+//==========================================================
+
+void OneNet_SendData(void)
+{
+    MQTT_PACKET_STRUCTURE mqttPacket = {NULL, 0, 0, 0}; //协议包
+
+    char buf[128];
+
+    short body_len = 0, i = 0;
+    memset(buf, 0, sizeof(buf)); //清空数组内容
+
+    body_len = OneNet_FillBuf(buf); //获取当前需要发送的数据流的总长度
+
+    if (body_len)
+    {
+        if (MQTT_PacketSaveData(DEVICE_ID, body_len, NULL, 5, &mqttPacket) == 0) //封包
+        {
+            for (; i < body_len; i++)
+            {
+                mqttPacket._data[mqttPacket._len++] = buf[i];
+            }
+            ESP8266_SendData(mqttPacket._data, mqttPacket._len); //上传数据到平台
+            MQTT_DeleteBuffer(&mqttPacket); //删包
+        }
+        else;
+        //			printf(  "WARN:EDP_NewBuffer Failed\r\n");
+    }
+}
+
+void OneNET_Subscribe(void)
+{
+	
+	MQTT_PACKET_STRUCTURE mqtt_packet = {NULL, 0, 0, 0};						//协议包
+	
+	char topic_buf[56];
+	const char *topic = topic_buf;
+	
+	snprintf(topic_buf, sizeof(topic_buf), "$sys/%s/%s/thing/property/set", PRODUCT_ID, DEVICE_ID);
+	
+    // printf("Subscribe Topic: %s\r\n", topic_buf);
+	
+	if(MQTT_PacketSubscribe(MQTT_SUBSCRIBE_ID, MQTT_QOS_LEVEL0, &topic, 1, &mqtt_packet) == 0)
+	{
+		ESP8266_SendData(mqtt_packet._data, mqtt_packet._len);					//向平台发送订阅请求
+		
+		MQTT_DeleteBuffer(&mqtt_packet);										//删包
+	}
+
+}
+
+
+//==========================================================
+//	函数名称：	OneNet_RevPro
+//
+//	函数功能：	平台返回数据检测
+//
+//	入口参数：	dataPtr：平台返回的数据
+//
+//	返回参数：	无
+//
+//	说明：
+//==========================================================
+void OneNet_RevPro(unsigned char *cmd)
+{
+	
+	char *req_payload = NULL;
+	char *cmdid_topic = NULL;
+	
+	unsigned short topic_len = 0;
+	unsigned short req_len = 0;
+	
+	unsigned char qos = 0;
+	static unsigned short pkt_id = 0;
+	
+	unsigned char type = 0;
+	
+	short result = 0;
+
+	char *dataPtr = NULL;
+	char numBuf[10];
+	int num = 0;
+	type = MQTT_UnPacketRecv(cmd);
+	switch(type)
+	{
+		case MQTT_PKT_PUBLISH:																//接收的Publish消息
+		
+			result = MQTT_UnPacketPublish(cmd, &cmdid_topic, &topic_len, &req_payload, &req_len, &qos, &pkt_id);
+			// if(result == 0)
+			// {
+			// 	printf("%s\r\n", req_payload);
+			// }
+		break;
+			
+		case MQTT_PKT_PUBACK:														//发送Publish消息，平台回复的Ack
+		
+			if(MQTT_UnPacketPublishAck(cmd) == 0)
+//				UsartPrintf(USART_DEBUG, "Tips:	MQTT Publish Send OK\r\n");
+			
+		break;
+		
+		case MQTT_PKT_SUBACK:																//发送Subscribe消息的Ack
+		
+			if(MQTT_UnPacketSubscribe(cmd) == 0)
+				;
+//				UsartPrintf(USART_DEBUG, "Tips:	MQTT Subscribe OK\r\n");
+		
+		break;
+		
+		default:
+			result = -1;
+		break;
+	}
+	
+	ESP8266_Clear();									//清空缓存
+	
+	if(result == -1)
+		return;
+
+	if(type == MQTT_PKT_CMD || type == MQTT_PKT_PUBLISH)
+	{
+		MQTT_FreeBuffer(cmdid_topic);
+		MQTT_FreeBuffer(req_payload);
+	}
+
+}
+
+uint8_t onenet_state(){
+	return OneNet_DevLink();
+}
diff --git a/Core/Src/esp8266.c b/Core/Src/esp8266.c
new file mode 100644
index 0000000..d16e94e
--- /dev/null
+++ b/Core/Src/esp8266.c
@@ -0,0 +1,256 @@
+// #include "stm32f103xb.h"
+
+//网络设备驱动
+#include "esp8266.h"
+
+//硬件驱动
+#include "main.h"
+#include "usart.h"
+
+
+//C库
+#include <string.h>
+#include <stdio.h>
+
+
+#define ESP8266_WIFI_INFO		"AT+CWJAP=\"Redmi K20 Pro Premium\",\"11223344\"\r\n"
+
+#define ESP8266_ONENET_INFO		"AT+CIPSTART=\"TCP\",\"183.230.40.96\",1883\r\n"
+
+
+unsigned char esp8266_buf[128];
+unsigned short esp8266_cnt = 0, esp8266_cntPre = 0;
+
+void Usart_SendString(UART_HandleTypeDef* huart, unsigned char* str, unsigned short len)
+{
+    unsigned short count = 0;
+
+    HAL_UART_Transmit(huart, (uint8_t*)str, len, 0xffff);
+    while (HAL_UART_GetState(huart) == HAL_UART_STATE_BUSY_TX);
+}
+
+//==========================================================
+//	函数名称：	ESP8266_Clear
+//
+//	函数功能：	清空缓存
+//
+//	入口参数：	无
+//
+//	返回参数：	无
+//
+//	说明：
+//==========================================================
+void ESP8266_Clear(void)
+{
+    memset(esp8266_buf, 0, sizeof(esp8266_buf));
+    esp8266_cnt = 0;
+}
+
+//==========================================================
+//	函数名称：	ESP8266_WaitRecive
+//
+//	函数功能：	等待接收完成
+//
+//	入口参数：	无
+//
+//	返回参数：	REV_OK-接收完成		REV_WAIT-接收超时未完成
+//
+//	说明：		循环调用检测是否接收完成
+//==========================================================
+_Bool ESP8266_WaitRecive(void)
+{
+    if (esp8266_cnt == 0) //如果接收计数为0 则说明没有处于接收数据中，所以直接跳出，结束函数
+        return REV_WAIT;
+
+    if (esp8266_cnt == esp8266_cntPre) //如果上一次的值和这次相同，则说明接收完毕
+    {
+        esp8266_cnt = 0; //清0接收计数
+
+        return REV_OK; //返回接收完成标志
+    }
+
+    esp8266_cntPre = esp8266_cnt; //置为相同
+
+    return REV_WAIT; //返回接收未完成标志
+}
+
+//==========================================================
+//	函数名称：	ESP8266_SendCmd
+//
+//	函数功能：	发送命令
+//
+//	入口参数：	cmd：命令
+//				res：需要检查的返回指令
+//
+//	返回参数：	0-成功	1-失败
+//
+//	说明：
+//==========================================================
+_Bool ESP8266_SendCmd(char* cmd, char* res)
+{
+    unsigned char timeOut = 200;
+
+    Usart_SendString(&huart2, (unsigned char*)cmd, strlen((const char*)cmd));
+
+    while (timeOut--)
+    {
+        if (ESP8266_WaitRecive() == REV_OK) //如果收到数据
+        {
+            if (strstr((const char*)esp8266_buf, res) != NULL) //如果检索到关键词
+            {
+                ESP8266_Clear(); //清空缓存
+
+                return 0;
+            }
+        }
+
+        HAL_Delay(10);
+    }
+
+    return 1;
+}
+
+//==========================================================
+//	函数名称：	ESP8266_SendData
+//
+//	函数功能：	发送数据
+//
+//	入口参数：	data：数据
+//				len：长度
+//
+//	返回参数：	无
+//
+//	说明：
+//==========================================================
+void ESP8266_SendData(unsigned char* data, unsigned short len)
+{
+    char cmdBuf[32];
+
+    ESP8266_Clear(); //清空接收缓存
+    sprintf(cmdBuf, "AT+CIPSEND=%d\r\n", len); //发送命令
+    if (!ESP8266_SendCmd(cmdBuf, ">")) //收到‘>’时可以发送数据
+    {
+        Usart_SendString(&huart2, data, len); //发送设备连接请求数据
+    }
+}
+
+//==========================================================
+//	函数名称：	ESP8266_GetIPD
+//
+//	函数功能：	获取平台返回的数据
+//
+//	入口参数：	等待的时间(乘以10ms)
+//
+//	返回参数：	平台返回的原始数据
+//
+//	说明：		不同网络设备返回的格式不同，需要去调试
+//				如ESP8266的返回格式为	"+IPD,x:yyy"	x代表数据长度，yyy是数据内容
+//==========================================================
+unsigned char* ESP8266_GetIPD(unsigned short timeOut)
+{
+    char* ptrIPD = NULL;
+
+    do
+    {
+        if (ESP8266_WaitRecive() == REV_OK) //如果接收完成
+        {
+            ptrIPD = strstr((char*)esp8266_buf, "IPD,"); //搜索“IPD”头
+            if (ptrIPD == NULL) //如果没找到，可能是IPD头的延迟，还是需要等待一会，但不会超过设定的时间
+            {
+                //printf("\"IPD\" not found\r\n");
+            }
+            else
+            {
+                ptrIPD = strchr(ptrIPD, ':'); //找到':'
+                if (ptrIPD != NULL)
+                {
+                    ptrIPD++;
+                    return (unsigned char*)(ptrIPD);
+                }
+                else
+                    return NULL;
+            }
+        }
+
+        HAL_Delay(5); //延时等待
+    }
+    while (timeOut--);
+
+    return NULL; //超时还未找到，返回空指针
+}
+
+//==========================================================
+//	函数名称：	ESP8266_Init
+//
+//	函数功能：	初始化ESP8266
+//
+//	入口参数：	无
+//
+//	返回参数：	无
+//
+//	说明：
+//==========================================================
+void ESP8266_Init(void)
+{
+    //	GPIO_InitTypeDef GPIO_Initure;
+    //
+    //	RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE);
+
+    //	//ESP8266复位引脚
+    //	GPIO_Initure.GPIO_Mode = GPIO_Mode_Out_PP;
+    //	GPIO_Initure.GPIO_Pin = GPIO_Pin_5;					//GPIOB5-复位
+    //	GPIO_Initure.GPIO_Speed = GPIO_Speed_50MHz;
+    //	GPIO_Init(GPIOB, &GPIO_Initure);
+    //
+    //	GPIO_WriteBit(GPIOB, GPIO_Pin_5, Bit_RESET);
+    //	HAL_Delay(250);
+    //	GPIO_WriteBit(GPIOB, GPIO_Pin_5, Bit_SET);
+    //	HAL_Delay(500);
+
+    //    HAL_GPIO_WritePin(ESP_RST_GPIO_Port,ESP_RST_Pin,GPIO_PIN_RESET);
+    //    HAL_Delay(250);
+    //    HAL_GPIO_WritePin(ESP_RST_GPIO_Port,ESP_RST_Pin,GPIO_PIN_SET);
+    //    HAL_Delay(500);
+
+    ESP8266_Clear();
+
+    // printf("1. AT\r\n");
+    while (ESP8266_SendCmd("AT\r\n", "OK"))
+        HAL_Delay(1000);
+
+    // printf("2. CWMODE\r\n");
+    while (ESP8266_SendCmd("AT+CWMODE=1\r\n", "OK"))
+        HAL_Delay(1000);
+
+    // printf("3. CWJAP\r\n");
+    while (ESP8266_SendCmd(ESP8266_WIFI_INFO, "GOT IP"))
+        HAL_Delay(1000);
+
+    // printf("4. CIPSTART\r\n");
+    while (ESP8266_SendCmd(ESP8266_ONENET_INFO, "CONNECT"))
+        HAL_Delay(1000);
+
+    // printf("5. ESP8266 Init OK\r\n");
+}
+
+
+//==========================================================
+//	函数名称：	ESP8266_IRQHandler
+//
+//	函数功能：	串口2收发中断
+//
+//	入口参数：	无
+//
+//	返回参数：	无
+//
+
+//	说明：
+//==========================================================
+//void ESP8266_IRQHandler(void)
+//{
+//		if(esp8266_cnt >= sizeof(esp8266_buf))
+//    {
+//       esp8266_cnt = 0; //防止串口被刷爆
+//    }
+//    esp8266_buf[esp8266_cnt++] = USART1->DR;
+//}
diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c
index 8b3a1b9..78a68a5 100644
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@@ -51,13 +51,16 @@ void MX_GPIO_Init(void)
   __HAL_RCC_GPIOB_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(RC522_RST_GPIO_Port, RC522_RST_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, RC522_CS_Pin|RELAY1_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(RC522_CS_GPIO_Port, RC522_CS_Pin, GPIO_PIN_RESET);
+
+  /*Configure GPIO pin Output Level */
+  HAL_GPIO_WritePin(RELAY1_GPIO_Port, RELAY1_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin : LED0_Pin */
   GPIO_InitStruct.Pin = LED0_Pin;
@@ -73,12 +76,12 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(RC522_RST_GPIO_Port, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : RC522_CS_Pin RELAY1_Pin */
-  GPIO_InitStruct.Pin = RC522_CS_Pin|RELAY1_Pin;
+  /*Configure GPIO pin : RC522_CS_Pin */
+  GPIO_InitStruct.Pin = RC522_CS_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+  HAL_GPIO_Init(RC522_CS_GPIO_Port, &GPIO_InitStruct);
 
   /*Configure GPIO pins : KEY4_Pin KEY3_Pin KEY2_Pin */
   GPIO_InitStruct.Pin = KEY4_Pin|KEY3_Pin|KEY2_Pin;
@@ -92,6 +95,13 @@ void MX_GPIO_Init(void)
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(KEY1_GPIO_Port, &GPIO_InitStruct);
 
+  /*Configure GPIO pin : RELAY1_Pin */
+  GPIO_InitStruct.Pin = RELAY1_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(RELAY1_GPIO_Port, &GPIO_InitStruct);
+
   /* EXTI interrupt init*/
   HAL_NVIC_SetPriority(EXTI9_5_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(EXTI9_5_IRQn);
diff --git a/Core/Src/i2c.c b/Core/Src/i2c.c
index f2cf27b..1a4430c 100644
--- a/Core/Src/i2c.c
+++ b/Core/Src/i2c.c
@@ -73,7 +73,6 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* i2cHandle)
     */
     GPIO_InitStruct.Pin = OLED_SCL_Pin|OLED_SDA_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
     HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
diff --git a/Core/Src/main.c b/Core/Src/main.c
index e1f94c8..6b53d89 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -30,6 +30,8 @@
 #include "retarget.h"
 #include "oled.h"
 #include "rc522.h"
+#include "esp8266.h"
+#include "OneNet.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -50,6 +52,11 @@
 /* Private variables ---------------------------------------------------------*/
 
 /* USER CODE BEGIN PV */
+extern unsigned short esp8266_cnt;
+extern unsigned char esp8266_buf[128];
+uint8_t* dataPtr;
+uint8_t UART2_RxData;
+
 uint8_t rf_status;
 uint8_t rf_card_type[3];
 uint8_t rf_card_id[5];
@@ -103,28 +110,60 @@ int main(void)
   /* Initialize all configured peripherals */
   MX_GPIO_Init();
   MX_I2C1_Init();
-  MX_USART1_UART_Init();
   MX_SPI1_Init();
+  MX_USART1_UART_Init();
   MX_USART2_UART_Init();
   /* USER CODE BEGIN 2 */
+
   // Retarget uart
   RetargetInit(&huart1);
 
-  // Init RC522
-  MFRC_Init();
-  PCD_Reset();
-
   // Init OLED
   OLED_Init();
   OLED_Clear();
 
-  OLED_ShowString(0,0,"scanning...",12);
+  OLED_ShowString(0,0,"initializing...",12);
+
+  HAL_UART_Receive_IT(&huart2, (uint8_t *) &UART2_RxData, 1);
+  ESP8266_Init();
+  while (OneNet_DevLink()) {}
+  OneNET_Subscribe();
+
+  // Init RC522
+  MFRC_Init();
+  PCD_Reset();
+
+  OLED_ShowString(0,0,"OneNet online            ",12);
+  HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_RESET);
   /* USER CODE END 2 */
 
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
   {
+    // if (!OneNet_DevLink())
+    // {
+    //   OLED_ShowString(0,0,"OneNet online            ",12);
+    //   HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_RESET);
+    //   OneNet_SendData();
+    //   HAL_Delay(1000);
+    //   ESP8266_Clear();
+    // }
+    // else
+    // {
+    //   OLED_ShowString(0,0,"OneNet offline           ",12);
+    //   HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_SET);
+    // }
+    OneNet_SendData();
+    HAL_Delay(1000);
+    ESP8266_Clear();
+
+    dataPtr = ESP8266_GetIPD(0);
+    if (dataPtr != NULL)
+    {
+      OneNet_RevPro(dataPtr);
+    }
+
     rf_status = PCD_Request(PICC_REQALL, rf_card_type);
 
     if (!rf_status) {
@@ -135,9 +174,9 @@ int main(void)
 
     if (!rf_status) {
       rf_status = PCD_ERR;
-      printf(SEP);
-      printf("[i] Card Type: %02X %02X %02X\r\n", rf_card_type[0], rf_card_type[1], rf_card_type[2]);
-      printf("[i] Card ID  : %02X-%02X-%02X-%02X\r\n", rf_card_id[0], rf_card_id[1], rf_card_id[2], rf_card_id[3]);
+      // printf(SEP);
+      // printf("[i] Card Type: %02X %02X %02X\r\n", rf_card_type[0], rf_card_type[1], rf_card_type[2]);
+      // printf("[i] Card ID  : %02X-%02X-%02X-%02X\r\n", rf_card_id[0], rf_card_id[1], rf_card_id[2], rf_card_id[3]);
 
       OLED_ShowString(0, 2, "Typ:", 12);
       uint8_t card_type_buffer[9];
@@ -156,24 +195,24 @@ int main(void)
       rf_status = PCD_ERR;
 
       rf_status = PCD_AuthState(PICC_AUTHENT1A, ADDR, KEY_A, rf_card_id);
-      if(rf_status == PCD_OK)
-      {
-        printf("[*] Key A pass\r\n");
-      }
-      else
-      {
-        printf("[!] Key A verification failed\r\n");
-      }
+      // if(rf_status == PCD_OK)
+      // {
+      //   printf("[*] Key A pass\r\n");
+      // }
+      // else
+      // {
+      //   printf("[!] Key A verification failed\r\n");
+      // }
 
       rf_status = PCD_AuthState(PICC_AUTHENT1B, ADDR, KEY_B, rf_card_id);
-      if(rf_status == PCD_OK)
-      {
-        printf("[*] Key B pass\r\n");
-      }
-      else
-      {
-        printf("[!] Key B verification failed\r\n");
-      }
+      // if(rf_status == PCD_OK)
+      // {
+      //   printf("[*] Key B pass\r\n");
+      // }
+      // else
+      // {
+      //   printf("[!] Key B verification failed\r\n");
+      // }
     }
 
     if(rf_status == PCD_OK)
@@ -181,19 +220,19 @@ int main(void)
       rf_status = PCD_ERR;
       rf_status = PCD_ReadBlock(ADDR, rf_data);
 
-      if(rf_status == PCD_OK)
-      {
-        printf("[+] Data in sector %d block %d: ", ADDR/4, ADDR%4);
-        for(int i = 0; i < 16; i++)
-        {
-            printf("%02x", rf_data[i]);
-        }
-        printf("\r\n");
-      }
-      else
-      {
-          printf("Read card failed\r\n");
-      }
+      // if(rf_status == PCD_OK)
+      // {
+      //   printf("[+] Data in sector %d block %d: ", ADDR/4, ADDR%4);
+      //   for(int i = 0; i < 16; i++)
+      //   {
+      //       printf("%02x", rf_data[i]);
+      //   }
+      //   printf("\r\n");
+      // }
+      // else
+      // {
+      //     printf("Read card failed\r\n");
+      // }
       HAL_GPIO_WritePin(LED0_GPIO_Port, LED0_Pin, GPIO_PIN_RESET);
       HAL_Delay(3000);
     }
@@ -246,9 +285,30 @@ void SystemClock_Config(void)
 /* USER CODE BEGIN 4 */
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 {
-  if(GPIO_Pin == KEY1_Pin)
+  if(GPIO_Pin == KEY1_Pin || GPIO_Pin == KEY2_Pin || GPIO_Pin == KEY3_Pin || GPIO_Pin == KEY4_Pin)
   {
-    OLED_Clear();
+    HAL_GPIO_TogglePin(RELAY1_GPIO_Port, RELAY1_Pin);
+    if(HAL_GPIO_ReadPin(RELAY1_GPIO_Port, RELAY1_Pin) == GPIO_PIN_RESET)
+    {
+      OLED_ShowString(0, 6, "Relay1: ON ", 12);
+    }
+    else
+    {
+      OLED_ShowString(0, 6, "Relay1: OFF", 12);
+    }
+  }
+}
+
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
+{
+  if (huart == &huart2)
+  {
+    if (esp8266_cnt >= sizeof(esp8266_buf))
+    {
+      esp8266_cnt = 0;
+    }
+    esp8266_buf[esp8266_cnt++] = UART2_RxData;
+    HAL_UART_Receive_IT(&huart2, (uint8_t *)&UART2_RxData, 1);
   }
 }
 /* USER CODE END 4 */
diff --git a/Core/Src/stm32f1xx_it.c b/Core/Src/stm32f1xx_it.c
index 23e65f1..12c67bb 100644
--- a/Core/Src/stm32f1xx_it.c
+++ b/Core/Src/stm32f1xx_it.c
@@ -55,7 +55,8 @@
 /* USER CODE END 0 */
 
 /* External variables --------------------------------------------------------*/
-
+extern UART_HandleTypeDef huart1;
+extern UART_HandleTypeDef huart2;
 /* USER CODE BEGIN EV */
 
 /* USER CODE END EV */
@@ -212,6 +213,34 @@ void EXTI9_5_IRQHandler(void)
   /* USER CODE END EXTI9_5_IRQn 1 */
 }
 
+/**
+  * @brief This function handles USART1 global interrupt.
+  */
+void USART1_IRQHandler(void)
+{
+  /* USER CODE BEGIN USART1_IRQn 0 */
+
+  /* USER CODE END USART1_IRQn 0 */
+  HAL_UART_IRQHandler(&huart1);
+  /* USER CODE BEGIN USART1_IRQn 1 */
+
+  /* USER CODE END USART1_IRQn 1 */
+}
+
+/**
+  * @brief This function handles USART2 global interrupt.
+  */
+void USART2_IRQHandler(void)
+{
+  /* USER CODE BEGIN USART2_IRQn 0 */
+
+  /* USER CODE END USART2_IRQn 0 */
+  HAL_UART_IRQHandler(&huart2);
+  /* USER CODE BEGIN USART2_IRQn 1 */
+
+  /* USER CODE END USART2_IRQn 1 */
+}
+
 /**
   * @brief This function handles EXTI line[15:10] interrupts.
   */
diff --git a/Core/Src/usart.c b/Core/Src/usart.c
index 35f9d63..1de2af4 100644
--- a/Core/Src/usart.c
+++ b/Core/Src/usart.c
@@ -113,6 +113,9 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+    /* USART1 interrupt Init */
+    HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(USART1_IRQn);
   /* USER CODE BEGIN USART1_MspInit 1 */
 
   /* USER CODE END USART1_MspInit 1 */
@@ -140,6 +143,9 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+    /* USART2 interrupt Init */
+    HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
+    HAL_NVIC_EnableIRQ(USART2_IRQn);
   /* USER CODE BEGIN USART2_MspInit 1 */
 
   /* USER CODE END USART2_MspInit 1 */
@@ -163,6 +169,8 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_9|GPIO_PIN_10);
 
+    /* USART1 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART1_IRQn);
   /* USER CODE BEGIN USART1_MspDeInit 1 */
 
   /* USER CODE END USART1_MspDeInit 1 */
@@ -181,6 +189,8 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_2|GPIO_PIN_3);
 
+    /* USART2 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(USART2_IRQn);
   /* USER CODE BEGIN USART2_MspDeInit 1 */
 
   /* USER CODE END USART2_MspDeInit 1 */
diff --git a/Core/Startup/startup_stm32f103c6tx.s b/Core/Startup/startup_stm32f103c8tx.s
similarity index 92%
rename from Core/Startup/startup_stm32f103c6tx.s
rename to Core/Startup/startup_stm32f103c8tx.s
index 87ca9ca..7614285 100644
--- a/Core/Startup/startup_stm32f103c6tx.s
+++ b/Core/Startup/startup_stm32f103c8tx.s
@@ -1,8 +1,8 @@
 /**
   *************** (C) COPYRIGHT 2017 STMicroelectronics ************************
-  * @file      startup_stm32f103x6.s
+  * @file      startup_stm32f103xb.s
   * @author    MCD Application Team
-  * @brief     STM32F103x6 Devices vector table for Atollic toolchain.
+  * @brief     STM32F103xB Devices vector table for Atollic toolchain.
   *            This module performs:
   *                - Set the initial SP
   *                - Set the initial PC == Reset_Handler,
@@ -174,16 +174,16 @@ g_pfnVectors:
   .word TIM1_CC_IRQHandler
   .word TIM2_IRQHandler
   .word TIM3_IRQHandler
-  .word 0
+  .word TIM4_IRQHandler
   .word I2C1_EV_IRQHandler
   .word I2C1_ER_IRQHandler
-  .word 0
-  .word 0
+  .word I2C2_EV_IRQHandler
+  .word I2C2_ER_IRQHandler
   .word SPI1_IRQHandler
-  .word 0
+  .word SPI2_IRQHandler
   .word USART1_IRQHandler
   .word USART2_IRQHandler
-  .word 0
+  .word USART3_IRQHandler
   .word EXTI15_10_IRQHandler
   .word RTC_Alarm_IRQHandler
   .word USBWakeUp_IRQHandler
@@ -194,8 +194,8 @@ g_pfnVectors:
   .word 0
   .word 0
   .word 0
-  .word BootRAM        /* @0x108. This is for boot in RAM mode for
-                          STM32F10x Low Density devices.*/
+  .word BootRAM          /* @0x108. This is for boot in RAM mode for
+                            STM32F10x Medium Density devices. */
 
 /*******************************************************************************
 *
@@ -322,21 +322,36 @@ g_pfnVectors:
   .weak TIM3_IRQHandler
   .thumb_set TIM3_IRQHandler,Default_Handler
 
+  .weak TIM4_IRQHandler
+  .thumb_set TIM4_IRQHandler,Default_Handler
+
   .weak I2C1_EV_IRQHandler
   .thumb_set I2C1_EV_IRQHandler,Default_Handler
 
   .weak I2C1_ER_IRQHandler
   .thumb_set I2C1_ER_IRQHandler,Default_Handler
 
+  .weak I2C2_EV_IRQHandler
+  .thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+  .weak I2C2_ER_IRQHandler
+  .thumb_set I2C2_ER_IRQHandler,Default_Handler
+
   .weak SPI1_IRQHandler
   .thumb_set SPI1_IRQHandler,Default_Handler
 
+  .weak SPI2_IRQHandler
+  .thumb_set SPI2_IRQHandler,Default_Handler
+
   .weak USART1_IRQHandler
   .thumb_set USART1_IRQHandler,Default_Handler
 
   .weak USART2_IRQHandler
   .thumb_set USART2_IRQHandler,Default_Handler
 
+  .weak USART3_IRQHandler
+  .thumb_set USART3_IRQHandler,Default_Handler
+
   .weak EXTI15_10_IRQHandler
   .thumb_set EXTI15_10_IRQHandler,Default_Handler
 
@@ -346,3 +361,4 @@ g_pfnVectors:
   .weak USBWakeUp_IRQHandler
   .thumb_set USBWakeUp_IRQHandler,Default_Handler
 
+
diff --git a/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h b/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h
similarity index 98%
rename from Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h
rename to Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h
index 13694b7..82df4b0 100644
--- a/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h
+++ b/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h
@@ -1,6 +1,6 @@
 /**
   ******************************************************************************
-  * @file    stm32f103x6.h
+  * @file    stm32f103xb.h
   * @author  MCD Application Team
   * @brief   CMSIS Cortex-M3 Device Peripheral Access Layer Header File. 
   *          This file contains all the peripheral register's definitions, bits 
@@ -29,12 +29,12 @@
   * @{
   */
 
-/** @addtogroup stm32f103x6
+/** @addtogroup stm32f103xb
   * @{
   */
     
-#ifndef __STM32F103x6_H
-#define __STM32F103x6_H
+#ifndef __STM32F103xB_H
+#define __STM32F103xB_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -109,11 +109,16 @@ typedef enum
   TIM1_CC_IRQn                = 27,     /*!< TIM1 Capture Compare Interrupt                       */
   TIM2_IRQn                   = 28,     /*!< TIM2 global Interrupt                                */
   TIM3_IRQn                   = 29,     /*!< TIM3 global Interrupt                                */
+  TIM4_IRQn                   = 30,     /*!< TIM4 global Interrupt                                */
   I2C1_EV_IRQn                = 31,     /*!< I2C1 Event Interrupt                                 */
   I2C1_ER_IRQn                = 32,     /*!< I2C1 Error Interrupt                                 */
+  I2C2_EV_IRQn                = 33,     /*!< I2C2 Event Interrupt                                 */
+  I2C2_ER_IRQn                = 34,     /*!< I2C2 Error Interrupt                                 */
   SPI1_IRQn                   = 35,     /*!< SPI1 global Interrupt                                */
+  SPI2_IRQn                   = 36,     /*!< SPI2 global Interrupt                                */
   USART1_IRQn                 = 37,     /*!< USART1 global Interrupt                              */
   USART2_IRQn                 = 38,     /*!< USART2 global Interrupt                              */
+  USART3_IRQn                 = 39,     /*!< USART3 global Interrupt                              */
   EXTI15_10_IRQn              = 40,     /*!< External Line[15:10] Interrupts                      */
   RTC_Alarm_IRQn              = 41,     /*!< RTC Alarm through EXTI Line Interrupt                */
   USBWakeUp_IRQn              = 42,     /*!< USB Device WakeUp from suspend through EXTI Line Interrupt */
@@ -565,7 +570,7 @@ typedef struct
 
 
 #define FLASH_BASE            0x08000000UL /*!< FLASH base address in the alias region */
-#define FLASH_BANK1_END       0x08007FFFUL /*!< FLASH END address of bank1 */
+#define FLASH_BANK1_END       0x0801FFFFUL /*!< FLASH END address of bank1 */
 #define SRAM_BASE             0x20000000UL /*!< SRAM base address in the alias region */
 #define PERIPH_BASE           0x40000000UL /*!< Peripheral base address in the alias region */
 
@@ -580,11 +585,15 @@ typedef struct
 
 #define TIM2_BASE             (APB1PERIPH_BASE + 0x00000000UL)
 #define TIM3_BASE             (APB1PERIPH_BASE + 0x00000400UL)
+#define TIM4_BASE             (APB1PERIPH_BASE + 0x00000800UL)
 #define RTC_BASE              (APB1PERIPH_BASE + 0x00002800UL)
 #define WWDG_BASE             (APB1PERIPH_BASE + 0x00002C00UL)
 #define IWDG_BASE             (APB1PERIPH_BASE + 0x00003000UL)
+#define SPI2_BASE             (APB1PERIPH_BASE + 0x00003800UL)
 #define USART2_BASE           (APB1PERIPH_BASE + 0x00004400UL)
+#define USART3_BASE           (APB1PERIPH_BASE + 0x00004800UL)
 #define I2C1_BASE             (APB1PERIPH_BASE + 0x00005400UL)
+#define I2C2_BASE             (APB1PERIPH_BASE + 0x00005800UL)
 #define CAN1_BASE             (APB1PERIPH_BASE + 0x00006400UL)
 #define BKP_BASE              (APB1PERIPH_BASE + 0x00006C00UL)
 #define PWR_BASE              (APB1PERIPH_BASE + 0x00007000UL)
@@ -594,6 +603,7 @@ typedef struct
 #define GPIOB_BASE            (APB2PERIPH_BASE + 0x00000C00UL)
 #define GPIOC_BASE            (APB2PERIPH_BASE + 0x00001000UL)
 #define GPIOD_BASE            (APB2PERIPH_BASE + 0x00001400UL)
+#define GPIOE_BASE            (APB2PERIPH_BASE + 0x00001800UL)
 #define ADC1_BASE             (APB2PERIPH_BASE + 0x00002400UL)
 #define ADC2_BASE             (APB2PERIPH_BASE + 0x00002800UL)
 #define TIM1_BASE             (APB2PERIPH_BASE + 0x00002C00UL)
@@ -636,11 +646,15 @@ typedef struct
 
 #define TIM2                ((TIM_TypeDef *)TIM2_BASE)
 #define TIM3                ((TIM_TypeDef *)TIM3_BASE)
+#define TIM4                ((TIM_TypeDef *)TIM4_BASE)
 #define RTC                 ((RTC_TypeDef *)RTC_BASE)
 #define WWDG                ((WWDG_TypeDef *)WWDG_BASE)
 #define IWDG                ((IWDG_TypeDef *)IWDG_BASE)
+#define SPI2                ((SPI_TypeDef *)SPI2_BASE)
 #define USART2              ((USART_TypeDef *)USART2_BASE)
+#define USART3              ((USART_TypeDef *)USART3_BASE)
 #define I2C1                ((I2C_TypeDef *)I2C1_BASE)
+#define I2C2                ((I2C_TypeDef *)I2C2_BASE)
 #define USB                 ((USB_TypeDef *)USB_BASE)
 #define CAN1                ((CAN_TypeDef *)CAN1_BASE)
 #define BKP                 ((BKP_TypeDef *)BKP_BASE)
@@ -651,6 +665,7 @@ typedef struct
 #define GPIOB               ((GPIO_TypeDef *)GPIOB_BASE)
 #define GPIOC               ((GPIO_TypeDef *)GPIOC_BASE)
 #define GPIOD               ((GPIO_TypeDef *)GPIOD_BASE)
+#define GPIOE               ((GPIO_TypeDef *)GPIOE_BASE)
 #define ADC1                ((ADC_TypeDef *)ADC1_BASE)
 #define ADC2                ((ADC_TypeDef *)ADC2_BASE)
 #define ADC12_COMMON        ((ADC_Common_TypeDef *)ADC1_BASE)
@@ -1185,6 +1200,9 @@ typedef struct
 #define RCC_APB2RSTR_USART1RST               RCC_APB2RSTR_USART1RST_Msk        /*!< USART1 reset */
 
 
+#define RCC_APB2RSTR_IOPERST_Pos             (6U)                              
+#define RCC_APB2RSTR_IOPERST_Msk             (0x1UL << RCC_APB2RSTR_IOPERST_Pos) /*!< 0x00000040 */
+#define RCC_APB2RSTR_IOPERST                 RCC_APB2RSTR_IOPERST_Msk          /*!< I/O port E reset */
 
 
 
@@ -1217,6 +1235,18 @@ typedef struct
 #define RCC_APB1RSTR_PWRRST_Msk              (0x1UL << RCC_APB1RSTR_PWRRST_Pos) /*!< 0x10000000 */
 #define RCC_APB1RSTR_PWRRST                  RCC_APB1RSTR_PWRRST_Msk           /*!< Power interface reset */
 
+#define RCC_APB1RSTR_TIM4RST_Pos             (2U)                              
+#define RCC_APB1RSTR_TIM4RST_Msk             (0x1UL << RCC_APB1RSTR_TIM4RST_Pos) /*!< 0x00000004 */
+#define RCC_APB1RSTR_TIM4RST                 RCC_APB1RSTR_TIM4RST_Msk          /*!< Timer 4 reset */
+#define RCC_APB1RSTR_SPI2RST_Pos             (14U)                             
+#define RCC_APB1RSTR_SPI2RST_Msk             (0x1UL << RCC_APB1RSTR_SPI2RST_Pos) /*!< 0x00004000 */
+#define RCC_APB1RSTR_SPI2RST                 RCC_APB1RSTR_SPI2RST_Msk          /*!< SPI 2 reset */
+#define RCC_APB1RSTR_USART3RST_Pos           (18U)                             
+#define RCC_APB1RSTR_USART3RST_Msk           (0x1UL << RCC_APB1RSTR_USART3RST_Pos) /*!< 0x00040000 */
+#define RCC_APB1RSTR_USART3RST               RCC_APB1RSTR_USART3RST_Msk        /*!< USART 3 reset */
+#define RCC_APB1RSTR_I2C2RST_Pos             (22U)                             
+#define RCC_APB1RSTR_I2C2RST_Msk             (0x1UL << RCC_APB1RSTR_I2C2RST_Pos) /*!< 0x00400000 */
+#define RCC_APB1RSTR_I2C2RST                 RCC_APB1RSTR_I2C2RST_Msk          /*!< I2C 2 reset */
 
 #define RCC_APB1RSTR_USBRST_Pos              (23U)                             
 #define RCC_APB1RSTR_USBRST_Msk              (0x1UL << RCC_APB1RSTR_USBRST_Pos) /*!< 0x00800000 */
@@ -1279,6 +1309,9 @@ typedef struct
 #define RCC_APB2ENR_USART1EN                 RCC_APB2ENR_USART1EN_Msk          /*!< USART1 clock enable */
 
 
+#define RCC_APB2ENR_IOPEEN_Pos               (6U)                              
+#define RCC_APB2ENR_IOPEEN_Msk               (0x1UL << RCC_APB2ENR_IOPEEN_Pos)  /*!< 0x00000040 */
+#define RCC_APB2ENR_IOPEEN                   RCC_APB2ENR_IOPEEN_Msk            /*!< I/O port E clock enable */
 
 
 
@@ -1311,6 +1344,18 @@ typedef struct
 #define RCC_APB1ENR_PWREN_Msk                (0x1UL << RCC_APB1ENR_PWREN_Pos)   /*!< 0x10000000 */
 #define RCC_APB1ENR_PWREN                    RCC_APB1ENR_PWREN_Msk             /*!< Power interface clock enable */
 
+#define RCC_APB1ENR_TIM4EN_Pos               (2U)                              
+#define RCC_APB1ENR_TIM4EN_Msk               (0x1UL << RCC_APB1ENR_TIM4EN_Pos)  /*!< 0x00000004 */
+#define RCC_APB1ENR_TIM4EN                   RCC_APB1ENR_TIM4EN_Msk            /*!< Timer 4 clock enable */
+#define RCC_APB1ENR_SPI2EN_Pos               (14U)                             
+#define RCC_APB1ENR_SPI2EN_Msk               (0x1UL << RCC_APB1ENR_SPI2EN_Pos)  /*!< 0x00004000 */
+#define RCC_APB1ENR_SPI2EN                   RCC_APB1ENR_SPI2EN_Msk            /*!< SPI 2 clock enable */
+#define RCC_APB1ENR_USART3EN_Pos             (18U)                             
+#define RCC_APB1ENR_USART3EN_Msk             (0x1UL << RCC_APB1ENR_USART3EN_Pos) /*!< 0x00040000 */
+#define RCC_APB1ENR_USART3EN                 RCC_APB1ENR_USART3EN_Msk          /*!< USART 3 clock enable */
+#define RCC_APB1ENR_I2C2EN_Pos               (22U)                             
+#define RCC_APB1ENR_I2C2EN_Msk               (0x1UL << RCC_APB1ENR_I2C2EN_Pos)  /*!< 0x00400000 */
+#define RCC_APB1ENR_I2C2EN                   RCC_APB1ENR_I2C2EN_Msk            /*!< I2C 2 clock enable */
 
 #define RCC_APB1ENR_USBEN_Pos                (23U)                             
 #define RCC_APB1ENR_USBEN_Msk                (0x1UL << RCC_APB1ENR_USBEN_Pos)   /*!< 0x00800000 */
@@ -1999,6 +2044,20 @@ typedef struct
 #define AFIO_MAPR_USART2_REMAP_Msk           (0x1UL << AFIO_MAPR_USART2_REMAP_Pos) /*!< 0x00000008 */
 #define AFIO_MAPR_USART2_REMAP               AFIO_MAPR_USART2_REMAP_Msk        /*!< USART2 remapping */
 
+#define AFIO_MAPR_USART3_REMAP_Pos           (4U)                              
+#define AFIO_MAPR_USART3_REMAP_Msk           (0x3UL << AFIO_MAPR_USART3_REMAP_Pos) /*!< 0x00000030 */
+#define AFIO_MAPR_USART3_REMAP               AFIO_MAPR_USART3_REMAP_Msk        /*!< USART3_REMAP[1:0] bits (USART3 remapping) */
+#define AFIO_MAPR_USART3_REMAP_0             (0x1UL << AFIO_MAPR_USART3_REMAP_Pos) /*!< 0x00000010 */
+#define AFIO_MAPR_USART3_REMAP_1             (0x2UL << AFIO_MAPR_USART3_REMAP_Pos) /*!< 0x00000020 */
+
+/* USART3_REMAP configuration */
+#define AFIO_MAPR_USART3_REMAP_NOREMAP       0x00000000U                          /*!< No remap (TX/PB10, RX/PB11, CK/PB12, CTS/PB13, RTS/PB14) */
+#define AFIO_MAPR_USART3_REMAP_PARTIALREMAP_Pos (4U)                           
+#define AFIO_MAPR_USART3_REMAP_PARTIALREMAP_Msk (0x1UL << AFIO_MAPR_USART3_REMAP_PARTIALREMAP_Pos) /*!< 0x00000010 */
+#define AFIO_MAPR_USART3_REMAP_PARTIALREMAP  AFIO_MAPR_USART3_REMAP_PARTIALREMAP_Msk /*!< Partial remap (TX/PC10, RX/PC11, CK/PC12, CTS/PB13, RTS/PB14) */
+#define AFIO_MAPR_USART3_REMAP_FULLREMAP_Pos (4U)                              
+#define AFIO_MAPR_USART3_REMAP_FULLREMAP_Msk (0x3UL << AFIO_MAPR_USART3_REMAP_FULLREMAP_Pos) /*!< 0x00000030 */
+#define AFIO_MAPR_USART3_REMAP_FULLREMAP     AFIO_MAPR_USART3_REMAP_FULLREMAP_Msk /*!< Full remap (TX/PD8, RX/PD9, CK/PD10, CTS/PD11, RTS/PD12) */
 
 #define AFIO_MAPR_TIM1_REMAP_Pos             (6U)                              
 #define AFIO_MAPR_TIM1_REMAP_Msk             (0x3UL << AFIO_MAPR_TIM1_REMAP_Pos) /*!< 0x000000C0 */
@@ -2048,6 +2107,9 @@ typedef struct
 #define AFIO_MAPR_TIM3_REMAP_FULLREMAP_Msk   (0x3UL << AFIO_MAPR_TIM3_REMAP_FULLREMAP_Pos) /*!< 0x00000C00 */
 #define AFIO_MAPR_TIM3_REMAP_FULLREMAP       AFIO_MAPR_TIM3_REMAP_FULLREMAP_Msk /*!< Full remap (CH1/PC6, CH2/PC7, CH3/PC8, CH4/PC9) */
 
+#define AFIO_MAPR_TIM4_REMAP_Pos             (12U)                             
+#define AFIO_MAPR_TIM4_REMAP_Msk             (0x1UL << AFIO_MAPR_TIM4_REMAP_Pos) /*!< 0x00001000 */
+#define AFIO_MAPR_TIM4_REMAP                 AFIO_MAPR_TIM4_REMAP_Msk          /*!< TIM4_REMAP bit (TIM4 remapping) */
 
 #define AFIO_MAPR_CAN_REMAP_Pos              (13U)                             
 #define AFIO_MAPR_CAN_REMAP_Msk              (0x3UL << AFIO_MAPR_CAN_REMAP_Pos) /*!< 0x00006000 */
@@ -9600,12 +9662,18 @@ typedef struct
 #define DBGMCU_CR_DBG_TIM3_STOP_Pos         (12U)                              
 #define DBGMCU_CR_DBG_TIM3_STOP_Msk         (0x1UL << DBGMCU_CR_DBG_TIM3_STOP_Pos) /*!< 0x00001000 */
 #define DBGMCU_CR_DBG_TIM3_STOP             DBGMCU_CR_DBG_TIM3_STOP_Msk        /*!< TIM3 counter stopped when core is halted */
+#define DBGMCU_CR_DBG_TIM4_STOP_Pos         (13U)                              
+#define DBGMCU_CR_DBG_TIM4_STOP_Msk         (0x1UL << DBGMCU_CR_DBG_TIM4_STOP_Pos) /*!< 0x00002000 */
+#define DBGMCU_CR_DBG_TIM4_STOP             DBGMCU_CR_DBG_TIM4_STOP_Msk        /*!< TIM4 counter stopped when core is halted */
 #define DBGMCU_CR_DBG_CAN1_STOP_Pos         (14U)                              
 #define DBGMCU_CR_DBG_CAN1_STOP_Msk         (0x1UL << DBGMCU_CR_DBG_CAN1_STOP_Pos) /*!< 0x00004000 */
 #define DBGMCU_CR_DBG_CAN1_STOP             DBGMCU_CR_DBG_CAN1_STOP_Msk        /*!< Debug CAN1 stopped when Core is halted */
 #define DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT_Pos (15U)                             
 #define DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT_Msk (0x1UL << DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT_Pos) /*!< 0x00008000 */
 #define DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT    DBGMCU_CR_DBG_I2C1_SMBUS_TIMEOUT_Msk /*!< SMBUS timeout mode stopped when Core is halted */
+#define DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT_Pos (16U)                             
+#define DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT_Msk (0x1UL << DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT_Pos) /*!< 0x00010000 */
+#define DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT    DBGMCU_CR_DBG_I2C2_SMBUS_TIMEOUT_Msk /*!< SMBUS timeout mode stopped when Core is halted */
 
 /******************************************************************************/
 /*                                                                            */
@@ -9778,6 +9846,30 @@ typedef struct
 #define FLASH_WRP0_nWRP0_Msk                (0xFFUL << FLASH_WRP0_nWRP0_Pos)    /*!< 0x0000FF00 */
 #define FLASH_WRP0_nWRP0                    FLASH_WRP0_nWRP0_Msk               /*!< Flash memory write protection complemented option bytes */
 
+/******************  Bit definition for FLASH_WRP1 register  ******************/
+#define FLASH_WRP1_WRP1_Pos                 (16U)                              
+#define FLASH_WRP1_WRP1_Msk                 (0xFFUL << FLASH_WRP1_WRP1_Pos)     /*!< 0x00FF0000 */
+#define FLASH_WRP1_WRP1                     FLASH_WRP1_WRP1_Msk                /*!< Flash memory write protection option bytes */
+#define FLASH_WRP1_nWRP1_Pos                (24U)                              
+#define FLASH_WRP1_nWRP1_Msk                (0xFFUL << FLASH_WRP1_nWRP1_Pos)    /*!< 0xFF000000 */
+#define FLASH_WRP1_nWRP1                    FLASH_WRP1_nWRP1_Msk               /*!< Flash memory write protection complemented option bytes */
+
+/******************  Bit definition for FLASH_WRP2 register  ******************/
+#define FLASH_WRP2_WRP2_Pos                 (0U)                               
+#define FLASH_WRP2_WRP2_Msk                 (0xFFUL << FLASH_WRP2_WRP2_Pos)     /*!< 0x000000FF */
+#define FLASH_WRP2_WRP2                     FLASH_WRP2_WRP2_Msk                /*!< Flash memory write protection option bytes */
+#define FLASH_WRP2_nWRP2_Pos                (8U)                               
+#define FLASH_WRP2_nWRP2_Msk                (0xFFUL << FLASH_WRP2_nWRP2_Pos)    /*!< 0x0000FF00 */
+#define FLASH_WRP2_nWRP2                    FLASH_WRP2_nWRP2_Msk               /*!< Flash memory write protection complemented option bytes */
+
+/******************  Bit definition for FLASH_WRP3 register  ******************/
+#define FLASH_WRP3_WRP3_Pos                 (16U)                              
+#define FLASH_WRP3_WRP3_Msk                 (0xFFUL << FLASH_WRP3_WRP3_Pos)     /*!< 0x00FF0000 */
+#define FLASH_WRP3_WRP3                     FLASH_WRP3_WRP3_Msk                /*!< Flash memory write protection option bytes */
+#define FLASH_WRP3_nWRP3_Pos                (24U)                              
+#define FLASH_WRP3_nWRP3_Msk                (0xFFUL << FLASH_WRP3_nWRP3_Pos)    /*!< 0xFF000000 */
+#define FLASH_WRP3_nWRP3                    FLASH_WRP3_nWRP3_Msk               /*!< Flash memory write protection complemented option bytes */
+
 
 
 /**
@@ -9823,7 +9915,8 @@ typedef struct
 #define IS_GPIO_ALL_INSTANCE(INSTANCE) (((INSTANCE) == GPIOA) || \
                                         ((INSTANCE) == GPIOB) || \
                                         ((INSTANCE) == GPIOC) || \
-                                        ((INSTANCE) == GPIOD))
+                                        ((INSTANCE) == GPIOD) || \
+                                        ((INSTANCE) == GPIOE))
 
 /**************************** GPIO Alternate Function Instances ***************/
 #define IS_GPIO_AF_INSTANCE(INSTANCE) IS_GPIO_ALL_INSTANCE(INSTANCE)
@@ -9832,7 +9925,8 @@ typedef struct
 #define IS_GPIO_LOCK_INSTANCE(INSTANCE) IS_GPIO_ALL_INSTANCE(INSTANCE)
 
 /******************************** I2C Instances *******************************/
-#define IS_I2C_ALL_INSTANCE(INSTANCE) ((INSTANCE) == I2C1)
+#define IS_I2C_ALL_INSTANCE(INSTANCE) (((INSTANCE) == I2C1) || \
+                                       ((INSTANCE) == I2C2))
 
 /******************************* SMBUS Instances ******************************/
 #define IS_SMBUS_ALL_INSTANCE         IS_I2C_ALL_INSTANCE
@@ -9841,86 +9935,102 @@ typedef struct
 #define IS_IWDG_ALL_INSTANCE(INSTANCE)  ((INSTANCE) == IWDG)
 
 /******************************** SPI Instances *******************************/
-#define IS_SPI_ALL_INSTANCE(INSTANCE) ((INSTANCE) == SPI1)
+#define IS_SPI_ALL_INSTANCE(INSTANCE) (((INSTANCE) == SPI1) || \
+                                       ((INSTANCE) == SPI2))
 
 /****************************** START TIM Instances ***************************/
 /****************************** TIM Instances *********************************/
 #define IS_TIM_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_ADVANCED_INSTANCE(INSTANCE) ((INSTANCE) == TIM1)
 
 #define IS_TIM_CC1_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_CC2_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_CC3_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_CC4_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_CLOCKSOURCE_ETRMODE1_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_CLOCKSOURCE_ETRMODE2_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_CLOCKSOURCE_TIX_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_CLOCKSOURCE_ITRX_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_OCXREF_CLEAR_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_ENCODER_INTERFACE_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_XOR_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_MASTER_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_SLAVE_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_BREAK_INSTANCE(INSTANCE)\
   ((INSTANCE) == TIM1)
@@ -9939,6 +10049,12 @@ typedef struct
       ((CHANNEL) == TIM_CHANNEL_4)))           \
     ||                                         \
     (((INSTANCE) == TIM3) &&                   \
+     (((CHANNEL) == TIM_CHANNEL_1) ||          \
+      ((CHANNEL) == TIM_CHANNEL_2) ||          \
+      ((CHANNEL) == TIM_CHANNEL_3) ||          \
+      ((CHANNEL) == TIM_CHANNEL_4)))           \
+    ||                                         \
+    (((INSTANCE) == TIM4) &&                   \
      (((CHANNEL) == TIM_CHANNEL_1) ||          \
       ((CHANNEL) == TIM_CHANNEL_2) ||          \
       ((CHANNEL) == TIM_CHANNEL_3) ||          \
@@ -9953,7 +10069,8 @@ typedef struct
 #define IS_TIM_COUNTER_MODE_SELECT_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_REPETITION_COUNTER_INSTANCE(INSTANCE)\
   ((INSTANCE) == TIM1)
@@ -9961,28 +10078,33 @@ typedef struct
 #define IS_TIM_CLOCK_DIVISION_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
 
 #define IS_TIM_DMA_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
     
 #define IS_TIM_DMA_CC_INSTANCE(INSTANCE)\
   (((INSTANCE) == TIM1)    || \
    ((INSTANCE) == TIM2)    || \
-   ((INSTANCE) == TIM3))
+   ((INSTANCE) == TIM3)    || \
+   ((INSTANCE) == TIM4))
     
 #define IS_TIM_COMMUTATION_EVENT_INSTANCE(INSTANCE)\
   ((INSTANCE) == TIM1)
 
 #define IS_TIM_ETR_INSTANCE(INSTANCE)  (((INSTANCE) == TIM1)    || \
                                         ((INSTANCE) == TIM2)    || \
-                                        ((INSTANCE) == TIM3))
+                                        ((INSTANCE) == TIM3)    || \
+                                        ((INSTANCE) == TIM4))
 
 #define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE) (((INSTANCE) == TIM1)    || \
                                                          ((INSTANCE) == TIM2)    || \
-                                                         ((INSTANCE) == TIM3))
+                                                         ((INSTANCE) == TIM3)    || \
+                                                         ((INSTANCE) == TIM4))
 
 #define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)           0U
 
@@ -9991,39 +10113,48 @@ typedef struct
 
 /******************** USART Instances : Synchronous mode **********************/                                           
 #define IS_USART_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                     ((INSTANCE) == USART2))
+                                     ((INSTANCE) == USART2) || \
+                                     ((INSTANCE) == USART3))
 
 /******************** UART Instances : Asynchronous mode **********************/
 #define IS_UART_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                    ((INSTANCE) == USART2) )
+                                    ((INSTANCE) == USART2) || \
+                                    ((INSTANCE) == USART3))
 
 /******************** UART Instances : Half-Duplex mode **********************/
 #define IS_UART_HALFDUPLEX_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                               ((INSTANCE) == USART2) )
+                                               ((INSTANCE) == USART2) || \
+                                               ((INSTANCE) == USART3))
 
 /******************** UART Instances : LIN mode **********************/
 #define IS_UART_LIN_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                        ((INSTANCE) == USART2) )
+                                        ((INSTANCE) == USART2) || \
+                                        ((INSTANCE) == USART3))
 
 /****************** UART Instances : Hardware Flow control ********************/                                    
 #define IS_UART_HWFLOW_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                           ((INSTANCE) == USART2) )
+                                           ((INSTANCE) == USART2) || \
+                                           ((INSTANCE) == USART3))
 
 /********************* UART Instances : Smard card mode ***********************/
 #define IS_SMARTCARD_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                         ((INSTANCE) == USART2) )
+                                         ((INSTANCE) == USART2) || \
+                                         ((INSTANCE) == USART3))
 
 /*********************** UART Instances : IRDA mode ***************************/
 #define IS_IRDA_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                    ((INSTANCE) == USART2) )
+                                    ((INSTANCE) == USART2) || \
+                                    ((INSTANCE) == USART3))
 
 /***************** UART Instances : Multi-Processor mode **********************/
 #define IS_UART_MULTIPROCESSOR_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                                   ((INSTANCE) == USART2) )
+                                                   ((INSTANCE) == USART2) || \
+                                                   ((INSTANCE) == USART3))
 
 /***************** UART Instances : DMA mode available **********************/
 #define IS_UART_DMA_INSTANCE(INSTANCE) (((INSTANCE) == USART1) || \
-                                        ((INSTANCE) == USART2))
+                                        ((INSTANCE) == USART2) || \
+                                        ((INSTANCE) == USART3))
 
 /****************************** RTC Instances *********************************/
 #define IS_RTC_ALL_INSTANCE(INSTANCE)  ((INSTANCE) == RTC)
@@ -10054,40 +10185,40 @@ typedef struct
 
 /* Aliases for __IRQn */
 #define ADC1_IRQn               ADC1_2_IRQn
+#define TIM9_IRQn               TIM1_BRK_IRQn
 #define TIM1_BRK_TIM9_IRQn      TIM1_BRK_IRQn
 #define TIM1_BRK_TIM15_IRQn     TIM1_BRK_IRQn
-#define TIM9_IRQn               TIM1_BRK_IRQn
-#define TIM1_TRG_COM_TIM11_IRQn TIM1_TRG_COM_IRQn
 #define TIM1_TRG_COM_TIM17_IRQn TIM1_TRG_COM_IRQn
+#define TIM1_TRG_COM_TIM11_IRQn TIM1_TRG_COM_IRQn
 #define TIM11_IRQn              TIM1_TRG_COM_IRQn
-#define TIM1_UP_TIM10_IRQn      TIM1_UP_IRQn
 #define TIM10_IRQn              TIM1_UP_IRQn
+#define TIM1_UP_TIM10_IRQn      TIM1_UP_IRQn
 #define TIM1_UP_TIM16_IRQn      TIM1_UP_IRQn
-#define CEC_IRQn                USBWakeUp_IRQn
 #define OTG_FS_WKUP_IRQn        USBWakeUp_IRQn
+#define CEC_IRQn                USBWakeUp_IRQn
 #define USB_HP_IRQn             USB_HP_CAN1_TX_IRQn
 #define CAN1_TX_IRQn            USB_HP_CAN1_TX_IRQn
-#define USB_LP_IRQn             USB_LP_CAN1_RX0_IRQn
 #define CAN1_RX0_IRQn           USB_LP_CAN1_RX0_IRQn
+#define USB_LP_IRQn             USB_LP_CAN1_RX0_IRQn
 
 
 /* Aliases for __IRQHandler */
 #define ADC1_IRQHandler               ADC1_2_IRQHandler
+#define TIM9_IRQHandler               TIM1_BRK_IRQHandler
 #define TIM1_BRK_TIM9_IRQHandler      TIM1_BRK_IRQHandler
 #define TIM1_BRK_TIM15_IRQHandler     TIM1_BRK_IRQHandler
-#define TIM9_IRQHandler               TIM1_BRK_IRQHandler
-#define TIM1_TRG_COM_TIM11_IRQHandler TIM1_TRG_COM_IRQHandler
 #define TIM1_TRG_COM_TIM17_IRQHandler TIM1_TRG_COM_IRQHandler
+#define TIM1_TRG_COM_TIM11_IRQHandler TIM1_TRG_COM_IRQHandler
 #define TIM11_IRQHandler              TIM1_TRG_COM_IRQHandler
-#define TIM1_UP_TIM10_IRQHandler      TIM1_UP_IRQHandler
 #define TIM10_IRQHandler              TIM1_UP_IRQHandler
+#define TIM1_UP_TIM10_IRQHandler      TIM1_UP_IRQHandler
 #define TIM1_UP_TIM16_IRQHandler      TIM1_UP_IRQHandler
-#define CEC_IRQHandler                USBWakeUp_IRQHandler
 #define OTG_FS_WKUP_IRQHandler        USBWakeUp_IRQHandler
+#define CEC_IRQHandler                USBWakeUp_IRQHandler
 #define USB_HP_IRQHandler             USB_HP_CAN1_TX_IRQHandler
 #define CAN1_TX_IRQHandler            USB_HP_CAN1_TX_IRQHandler
-#define USB_LP_IRQHandler             USB_LP_CAN1_RX0_IRQHandler
 #define CAN1_RX0_IRQHandler           USB_LP_CAN1_RX0_IRQHandler
+#define USB_LP_IRQHandler             USB_LP_CAN1_RX0_IRQHandler
 
 
 /**
@@ -10103,7 +10234,7 @@ typedef struct
   }
 #endif /* __cplusplus */
   
-#endif /* __STM32F103x6_H */
+#endif /* __STM32F103xB_H */
   
   
 
diff --git a/IntelliChargingPile.ioc b/IntelliChargingPile.ioc
index 80cf38f..30b6b93 100644
--- a/IntelliChargingPile.ioc
+++ b/IntelliChargingPile.ioc
@@ -1,11 +1,11 @@
 #MicroXplorer Configuration settings - do not modify
-CAD.formats=
-CAD.pinconfig=
+CAD.formats=[]
+CAD.pinconfig=Dual
 CAD.provider=
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
-Mcu.CPN=STM32F103C6T6A
+Mcu.CPN=STM32F103C8T6
 Mcu.Family=STM32F1
 Mcu.IP0=I2C1
 Mcu.IP1=NVIC
@@ -15,7 +15,7 @@ Mcu.IP4=SYS
 Mcu.IP5=USART1
 Mcu.IP6=USART2
 Mcu.IPNb=7
-Mcu.Name=STM32F103C(4-6)Tx
+Mcu.Name=STM32F103C(8-B)Tx
 Mcu.Package=LQFP48
 Mcu.Pin0=PC13-TAMPER-RTC
 Mcu.Pin1=PD0-OSC_IN
@@ -42,13 +42,13 @@ Mcu.Pin9=PB0
 Mcu.PinsNb=22
 Mcu.ThirdPartyNb=0
 Mcu.UserConstants=
-Mcu.UserName=STM32F103C6Tx
+Mcu.UserName=STM32F103C8Tx
 MxCube.Version=6.14.0
 MxDb.Version=DB.6.0.140
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC.EXTI15_10_IRQn=true\:0\:0\:true\:false\:true\:true\:true\:true
-NVIC.EXTI9_5_IRQn=true\:0\:0\:true\:false\:true\:true\:true\:true
+NVIC.EXTI15_10_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.EXTI9_5_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
@@ -57,6 +57,8 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false
+NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.USART2_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 PA10.Mode=Asynchronous
 PA10.Signal=USART1_RX
@@ -114,9 +116,11 @@ PB15.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
 PB15.GPIO_PuPd=GPIO_PULLUP
 PB15.Locked=true
 PB15.Signal=GPXTI15
-PB7.GPIOParameters=GPIO_Label
+PB7.GPIOParameters=PinState,GPIO_PuPd,GPIO_Label
 PB7.GPIO_Label=RELAY1
+PB7.GPIO_PuPd=GPIO_PULLUP
 PB7.Locked=true
+PB7.PinState=GPIO_PIN_SET
 PB7.Signal=GPIO_Output
 PB8.GPIOParameters=GPIO_Label
 PB8.GPIO_Label=OLED_SCL
@@ -128,9 +132,10 @@ PB9.GPIO_Label=OLED_SDA
 PB9.Locked=true
 PB9.Mode=I2C
 PB9.Signal=I2C1_SDA
-PC13-TAMPER-RTC.GPIOParameters=GPIO_Label
+PC13-TAMPER-RTC.GPIOParameters=PinState,GPIO_Label
 PC13-TAMPER-RTC.GPIO_Label=LED0
 PC13-TAMPER-RTC.Locked=true
+PC13-TAMPER-RTC.PinState=GPIO_PIN_SET
 PC13-TAMPER-RTC.Signal=GPIO_Output
 PD0-OSC_IN.Mode=HSE-External-Oscillator
 PD0-OSC_IN.Signal=RCC_OSC_IN
@@ -146,7 +151,7 @@ ProjectManager.CoupleFile=true
 ProjectManager.CustomerFirmwarePackage=
 ProjectManager.DefaultFWLocation=true
 ProjectManager.DeletePrevious=true
-ProjectManager.DeviceId=STM32F103C6Tx
+ProjectManager.DeviceId=STM32F103C8Tx
 ProjectManager.FirmwarePackage=STM32Cube FW_F1 V1.8.6
 ProjectManager.FreePins=false
 ProjectManager.HalAssertFull=false
@@ -168,7 +173,7 @@ ProjectManager.ToolChainLocation=
 ProjectManager.UAScriptAfterPath=
 ProjectManager.UAScriptBeforePath=
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_I2C1_Init-I2C1-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_SPI1_Init-SPI1-false-HAL-true,6-MX_USART2_UART_Init-USART2-false-HAL-true
+ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_I2C1_Init-I2C1-false-HAL-true,4-MX_SPI1_Init-SPI1-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true,6-MX_USART2_UART_Init-USART2-false-HAL-true
 RCC.ADCFreqValue=36000000
 RCC.AHBFreq_Value=72000000
 RCC.APB1CLKDivider=RCC_HCLK_DIV2
@@ -201,7 +206,7 @@ SH.GPXTI8.ConfNb=1
 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_4
 SPI1.CalculateBaudRate=18.0 MBits/s
 SPI1.Direction=SPI_DIRECTION_2LINES
-SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler
+SPI1.IPParameters=VirtualType,Mode,Direction,BaudRatePrescaler,CalculateBaudRate
 SPI1.Mode=SPI_MODE_MASTER
 SPI1.VirtualType=VM_MASTER
 USART1.IPParameters=VirtualMode
diff --git a/STM32F103C6TX_FLASH.ld b/STM32F103C8TX_FLASH.ld
similarity index 95%
rename from STM32F103C6TX_FLASH.ld
rename to STM32F103C8TX_FLASH.ld
index 9f8ee9a..f382f77 100644
--- a/STM32F103C6TX_FLASH.ld
+++ b/STM32F103C8TX_FLASH.ld
@@ -5,9 +5,9 @@
 **
 ** @author      : Auto-generated by STM32CubeIDE
 **
-** @brief       : Linker script for STM32F103C6Tx Device from STM32F1 series
-**                      32KBytes FLASH
-**                      10KBytes RAM
+** @brief       : Linker script for STM32F103C8Tx Device from STM32F1 series
+**                      64KBytes FLASH
+**                      20KBytes RAM
 **
 **                Set heap size, stack size and stack location according
 **                to application requirements.
@@ -44,8 +44,8 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 /* Memories definition */
 MEMORY
 {
-  RAM    (xrw)    : ORIGIN = 0x20000000,   LENGTH = 10K
-  FLASH    (rx)    : ORIGIN = 0x8000000,   LENGTH = 32K
+  RAM    (xrw)    : ORIGIN = 0x20000000,   LENGTH = 20K
+  FLASH    (rx)    : ORIGIN = 0x8000000,   LENGTH = 64K
 }
 
 /* Sections */