Browse Source

删除串口代码,保留CAN代码

CHENJIE-PC\QiXiang_CHENJIE 2 years ago
parent
commit
44aa40cee9
9 changed files with 43 additions and 609 deletions
  1. 36 32
      .cproject
  2. 4 4
      .settings/language.settings.xml
  3. 0 37
      src/AppGlobalVar.c
  4. 0 44
      src/AppGlobalVar.h
  5. 0 3
      src/AppTaskCan.h
  6. 0 303
      src/AppTaskUart0.c
  7. 0 47
      src/AppTaskUart0.h
  8. 3 134
      src/AppTaskUart1.c
  9. 0 5
      src/main.c

+ 36 - 32
.cproject

@@ -16,14 +16,15 @@
 				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="com.nxp.s32ds.cle.arm.mbs.arm32.bare.buildArtefact.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=com.nxp.s32ds.cle.arm.mbs.arm32.bare.buildArtefact.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.exe.debug.222968549" name="Debug_FLASH" parent="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.exe.debug">
 					<folderInfo id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.exe.debug.222968549." name="/" resourcePath="">
 						<toolChain id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.toolchain.debug.1669149124" name="NXP GCC 9.2 for Arm 32-bit Bare-Metal" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.toolchain.debug">
-							<option defaultValue="true" id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.addtools.printsize.1799663837" name="Print size" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.addtools.printsize" valueType="boolean"/>
-							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.compiler.path.434372331" name="Path" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.compiler.path" value="${S32DS_K1_ARM32_GNU_9_2_TOOLCHAIN_DIR}" valueType="string"/>
-							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.target.libraries.933777928" name="Libraries support" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.target.libraries" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.target.libraries.newlib_nano_noio" valueType="enumerated"/>
-							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.mcpu.912012235" name="Arm family" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.mcpu" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.mcpu.cortex-m4" valueType="enumerated"/>
-							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.instructionset.775672044" name="Instruction set" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.instructionset" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.instructionset.thumb" valueType="enumerated"/>
-							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.endianness.823522198" name="Endianness" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.endianness" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.endianness.little" valueType="enumerated"/>
-							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.abi.2049331992" name="Float ABI" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.abi" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.abi.hard" valueType="enumerated"/>
-							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.unit.515607088" name="FPU Type" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.unit" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
+							<option defaultValue="true" id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.addtools.printsize.1799663837" name="Print size" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.addtools.printsize" useByScannerDiscovery="false" valueType="boolean"/>
+							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.compiler.path.434372331" name="Path" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.compiler.path" useByScannerDiscovery="false" value="${S32DS_K1_ARM32_GNU_9_2_TOOLCHAIN_DIR}" valueType="string"/>
+							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.target.libraries.933777928" name="Libraries support" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.target.libraries" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.option.target.libraries.newlib_nano_noio" valueType="enumerated"/>
+							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.mcpu.912012235" name="Arm family" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.mcpu" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.mcpu.cortex-m4" valueType="enumerated"/>
+							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.instructionset.775672044" name="Instruction set" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.instructionset" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.instructionset.thumb" valueType="enumerated"/>
+							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.endianness.823522198" name="Endianness" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.endianness" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.endianness.little" valueType="enumerated"/>
+							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.abi.2049331992" name="Float ABI" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.abi" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.abi.hard" valueType="enumerated"/>
+							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.unit.515607088" name="FPU Type" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.unit" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
+							<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.addtools.createflash.118878663" name="Create flash image" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.option.addtools.createflash" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.64147430" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
 							<builder buildPath="${workspace_loc:/S32K146_4G}/Debug_FLASH" id="com.freescale.s32ds.cross.gnu.builder.466747471" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="FSL Make Builder" superClass="com.freescale.s32ds.cross.gnu.builder"/>
 							<tool id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.tool.c.compiler.1980082058" name="Standard S32DS C Compiler" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.tool.c.compiler">
@@ -99,20 +100,20 @@
 								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.cpp.compiler.option.target.fpu.unit.237850730" name="FPU Type" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.cpp.compiler.option.target.fpu.unit" useByScannerDiscovery="true" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.cpp.compiler.option.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
 							</tool>
 							<tool id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.tool.c.linker.1997644081" name="Standard S32DS C Linker" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.gnu.9.2.tool.c.linker">
-								<option id="com.freescale.s32ds.cross.gnu.tool.c.linker.option.gcsections.1484145597" name="Remove unused sections (-Xlinker --gc-sections)" superClass="com.freescale.s32ds.cross.gnu.tool.c.linker.option.gcsections" value="false" valueType="boolean"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.libraries.1478856746" name="Libraries support" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.libraries" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.libraries.newlib_nano_noio" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.sysroot.87857832" name="Sysroot" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.sysroot" value="--sysroot=&quot;${S32DS_ARM32_NEWLIB_DIR}&quot;" valueType="string"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.mcpu.225477617" name="Arm family" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.mcpu" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.mcpu.cortex-m4" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.freescale.s32ds.cross.gnu.tool.c.linker.option.scriptfile.1071620537" name="Script files (-T)" superClass="com.freescale.s32ds.cross.gnu.tool.c.linker.option.scriptfile" valueType="stringList">
+								<option id="com.freescale.s32ds.cross.gnu.tool.c.linker.option.gcsections.1484145597" name="Remove unused sections (-Xlinker --gc-sections)" superClass="com.freescale.s32ds.cross.gnu.tool.c.linker.option.gcsections" useByScannerDiscovery="false" value="false" valueType="boolean"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.libraries.1478856746" name="Libraries support" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.libraries" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.libraries.newlib_nano_noio" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.sysroot.87857832" name="Sysroot" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.sysroot" useByScannerDiscovery="false" value="--sysroot=&quot;${S32DS_ARM32_NEWLIB_DIR}&quot;" valueType="string"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.mcpu.225477617" name="Arm family" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.mcpu" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.mcpu.cortex-m4" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.freescale.s32ds.cross.gnu.tool.c.linker.option.scriptfile.1071620537" name="Script files (-T)" superClass="com.freescale.s32ds.cross.gnu.tool.c.linker.option.scriptfile" useByScannerDiscovery="false" valueType="stringList">
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Project_Settings/Linker_Files/linker_flash_s32k146.ld&quot;"/>
 								</option>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.instructionset.1152158946" name="Instruction set" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.instructionset" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.instructionset.thumb" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.endianness.991000104" name="Endianness" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.endianness" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.endianness.little" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.abi.1989513358" name="Float ABI" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.abi" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.abi.hard" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.unit.1468430786" name="FPU Type" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.unit" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
-								<option id="gnu.c.link.option.ldflags.1002666294" name="Linker flags" superClass="gnu.c.link.option.ldflags" value="--entry=Reset_Handler -ggdb3" valueType="string"/>
-								<option id="gnu.c.link.option.nostart.970867213" name="Do not use standard start files (-nostartfiles)" superClass="gnu.c.link.option.nostart" value="true" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.link.option.libs.2096560342" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.instructionset.1152158946" name="Instruction set" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.instructionset" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.instructionset.thumb" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.endianness.991000104" name="Endianness" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.endianness" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.endianness.little" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.abi.1989513358" name="Float ABI" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.abi" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.abi.hard" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.unit.1468430786" name="FPU Type" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.unit" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.c.linker.option.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
+								<option id="gnu.c.link.option.ldflags.1002666294" name="Linker flags" superClass="gnu.c.link.option.ldflags" useByScannerDiscovery="false" value="--entry=Reset_Handler -ggdb3" valueType="string"/>
+								<option id="gnu.c.link.option.nostart.970867213" name="Do not use standard start files (-nostartfiles)" superClass="gnu.c.link.option.nostart" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.link.option.libs.2096560342" name="Libraries (-l)" superClass="gnu.c.link.option.libs" useByScannerDiscovery="false" valueType="libs">
 									<listOptionValue builtIn="false" value="c"/>
 									<listOptionValue builtIn="false" value="m"/>
 									<listOptionValue builtIn="false" value="gcc"/>
@@ -131,11 +132,11 @@
 							</tool>
 							<tool id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.archiver.50914677" name="Standard S32DS Archiver" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.archiver"/>
 							<tool id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.339533218" name="Standard S32DS Assembler" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler">
-								<option id="com.freescale.s32ds.cross.gnu.tool.assembler.usepreprocessor.608521688" name="Use preprocessor" superClass="com.freescale.s32ds.cross.gnu.tool.assembler.usepreprocessor" value="true" valueType="boolean"/>
-								<option defaultValue="gnu.c.debugging.level.max" id="com.freescale.s32ds.cross.gnu.tool.assembler.option.debugging.level.935781758" name="Debug Level" superClass="com.freescale.s32ds.cross.gnu.tool.assembler.option.debugging.level" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.libraries.2115819142" name="Libraries support" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.libraries" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.libraries.newlib_nano_noio" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.sysroot.1519150514" name="Sysroot" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.sysroot" value="--sysroot=&quot;${S32DS_ARM32_NEWLIB_DIR}&quot;" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.763521555" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
+								<option id="com.freescale.s32ds.cross.gnu.tool.assembler.usepreprocessor.608521688" name="Use preprocessor" superClass="com.freescale.s32ds.cross.gnu.tool.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option defaultValue="gnu.c.debugging.level.max" id="com.freescale.s32ds.cross.gnu.tool.assembler.option.debugging.level.935781758" name="Debug Level" superClass="com.freescale.s32ds.cross.gnu.tool.assembler.option.debugging.level" useByScannerDiscovery="false" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.libraries.2115819142" name="Libraries support" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.libraries" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.libraries.newlib_nano_noio" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.sysroot.1519150514" name="Sysroot" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.sysroot" useByScannerDiscovery="false" value="--sysroot=&quot;${S32DS_ARM32_NEWLIB_DIR}&quot;" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.763521555" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="../FreeRTOS/Source/include"/>
 									<listOptionValue builtIn="false" value="../RTD/include"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS/Source/portable/GCC/ARM_CM4F}&quot;"/>
@@ -149,15 +150,17 @@
 									<listOptionValue builtIn="false" value="&quot;${PLATFORMSDK_S32K1_2021_08_S32K146_M4F_1.0.0_PATH}/SW32K1_RTD_4_4_1_0_0_D2108/Platform_TS_T40D2M10I0R0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PLATFORMSDK_S32K1_2021_08_S32K146_M4F_1.0.0_PATH}/SW32K1_RTD_4_4_1_0_0_D2108/Platform_TS_T40D2M10I0R0/startup/include&quot;"/>
 								</option>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.mcpu.1538908586" name="Arm family" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.mcpu" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.mcpu.cortex-m4" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.instructionset.1659079625" name="Instruction set" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.instructionset" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.instructionset.thumb" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.endianness.246218978" name="Endianness" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.endianness" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.endianness.little" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.abi.1586904906" name="Float ABI" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.abi" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.abi.hard" valueType="enumerated"/>
-								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.unit.1665512193" name="FPU Type" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.unit" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.mcpu.1538908586" name="Arm family" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.mcpu" useByScannerDiscovery="true" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.mcpu.cortex-m4" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.instructionset.1659079625" name="Instruction set" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.instructionset" useByScannerDiscovery="true" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.instructionset.thumb" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.endianness.246218978" name="Endianness" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.endianness" useByScannerDiscovery="false" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.endianness.little" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.abi.1586904906" name="Float ABI" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.abi" useByScannerDiscovery="true" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.abi.hard" valueType="enumerated"/>
+								<option id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.unit.1665512193" name="FPU Type" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.unit" useByScannerDiscovery="true" value="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.assembler.option.target.fpu.unit.fpv4spd16" valueType="enumerated"/>
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1966293971" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 								<inputType id="com.freescale.s32ds.cross.gnu.tool.assembler.inputType.asmfile.1184782747" superClass="com.freescale.s32ds.cross.gnu.tool.assembler.inputType.asmfile"/>
 							</tool>
-							<tool id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.createflash.655082520" name="Standard S32DS Create Flash Image" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.createflash"/>
+							<tool id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.createflash.655082520" name="Standard S32DS Create Flash Image" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.createflash">
+								<option id="com.freescale.s32ds.cross.gnu.option.createflash.choice.1356908850" superClass="com.freescale.s32ds.cross.gnu.option.createflash.choice" useByScannerDiscovery="false" value="com.freescale.s32ds.cross.gnu.option.createflash.choice.ihex" valueType="enumerated"/>
+							</tool>
 							<tool id="com.freescale.s32ds.cross.gnu.tool.createlisting.958717661" name="Standard S32DS Create Listing" superClass="com.freescale.s32ds.cross.gnu.tool.createlisting">
 								<option id="com.freescale.s32ds.cross.gnu.option.createlisting.source.623943954" name="Display source (--source|-S)" superClass="com.freescale.s32ds.cross.gnu.option.createlisting.source" value="true" valueType="boolean"/>
 								<option id="com.freescale.s32ds.cross.gnu.option.createlisting.allheaders.743274389" name="Display all headers (--all-headers|-x)" superClass="com.freescale.s32ds.cross.gnu.option.createlisting.allheaders" value="true" valueType="boolean"/>
@@ -166,7 +169,8 @@
 								<option id="com.freescale.s32ds.cross.gnu.option.createlisting.wide.1276236855" name="Wide lines (--wide|-w)" superClass="com.freescale.s32ds.cross.gnu.option.createlisting.wide" value="true" valueType="boolean"/>
 							</tool>
 							<tool id="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.printsize.1466716249" name="Standard S32DS Print Size" superClass="com.nxp.s32ds.cle.arm.mbs.arm32.bare.tool.printsize">
-								<option id="com.freescale.s32ds.cross.gnu.option.printsize.format.1897015732" name="Size format" superClass="com.freescale.s32ds.cross.gnu.option.printsize.format"/>
+								<option id="com.freescale.s32ds.cross.gnu.option.printsize.format.1897015732" name="Size format" superClass="com.freescale.s32ds.cross.gnu.option.printsize.format" useByScannerDiscovery="false"/>
+								<option id="com.freescale.s32ds.cross.gnu.option.printsize.hex.949405547" name="Hex" superClass="com.freescale.s32ds.cross.gnu.option.printsize.hex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							</tool>
 							<tool id="com.freescale.s32ds.cross.gnu.c.preprocessor.179719808" name="Standard S32DS C Preprocessor" superClass="com.freescale.s32ds.cross.gnu.c.preprocessor"/>
 							<tool id="com.freescale.s32ds.cross.gnu.cpp.preprocessor.2124652268" name="Standard S32DS C++ Preprocessor" superClass="com.freescale.s32ds.cross.gnu.cpp.preprocessor"/>

+ 4 - 4
.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1998488586995695481" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1592915166706465292" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1998488586995695481" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1592915166706465292" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -27,7 +27,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1998488586995695481" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1592915166706465292" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -38,7 +38,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1998488586995695481" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1592915166706465292" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 0 - 37
src/AppGlobalVar.c

@@ -62,43 +62,6 @@ uint8 BufferRead[EEP_WRTESTPATT_SIZE] = {0};
 #define EEP_STOP_SEC_VAR_INIT_8_NO_CACHEABLE
 #include "Eep_MemMap.h"
 
-/*以下变量均为串口协议相关变量*/
-#ifdef APP_UART0_ENABLE
-AppDataBody AppDataInfo = {BMS_CELLNUM, BMS_TEMPNUM};
-uint16 avrgCellVol = 0;			 //平均电压
-uint16 bmsHwVersion = 0;
-uint32 bmsSwVersion = 0;
-uint16 battCellU[BMS_CELLNUM];	 //电池电压
-uint16 battI = 0;				 // BMS电流(tcp上传)
-uint16 battPackVol = 0;			 // bms电压
-
-uint16 maxCellVol = 0;			 //最大单体电压
-uint16 minCellVol = 0;			 //最小单体电压
-uint16 socd_pct_vcuSoc = 0;		 // soc(tcp上传,精度0.1)
-uint16 sohd_pct_bcuSoh = 0;		 // soh(tcp上传,精度0.1)
-uint32 battBalanceoInfo = 0;  //
-uint32 battProtectState = 0;	 // bms保护状态
-uint32 battWarningState = 0;	 // bms告警状态
-uint8 AvgBattTemp = 0;			 //平均单体温度
-uint8 battCellTemp[BMS_TEMPNUM]; //电池温度
-uint8 Battdesigncap = 0;		 //电池包设计容量
-uint8 battHeatEnableState = 0;	 // bms加热状态
-uint8 battMOSSwitchState = 0;	 // bms mos开关状态
-uint8 battSOC = 0;				 // bms发送soc
-uint8 battSOH = 0;				 // bms发送soh
-uint8 battWorkState = 0;		 // bms工作状态
-uint8 BmsOtherTemp = 0;			 // BMS其他温度,没有其他温度,为0
-uint8 maxCellTemp = 0;			 //最大单体温度
-uint8 minCellTemp = 0;			 //最小单体温度
-uint8 OtherTemp = 0;			 //通讯模块其他温度
-uint8 battHeatState = 0;
-uint8 battFanState = 0;
-uint8 battRelayState = 0;
-uint8 battConverState = 0;
-uint8 battSeparateEnable = 0;
-uint8 battSeparateEnableState = 0;
-uint16 ErrorArray[5] = {0};
-#endif
 /*以下变量均为App_CAN相关变量*/
 #ifdef APP_CAN_ENABLE
 // VCU相关

+ 0 - 44
src/AppGlobalVar.h

@@ -66,50 +66,6 @@ extern char IccidNum[20];
 VAR_ALIGN(extern uint8 dataWrTestPatt[EEP_WRTESTPATT_SIZE],4)
 VAR_ALIGN(extern uint8 BufferRead[EEP_WRTESTPATT_SIZE],4)
 
-/*以下变量均为串口协议相关变量*/
-#ifdef APP_UART0_ENABLE
-#define BMS_CELLNUM 120
-#define BMS_TEMPNUM 80
-typedef struct _AppDataType
-{
-    uint8 BattCellCount; //电池模组个数
-    uint8 BattTempCount; //电池温度个数
-} AppDataBody;
-extern AppDataBody AppDataInfo;
-extern uint16 avrgCellVol;              //平均电压
-extern uint16 battCellU[BMS_CELLNUM];   //电池电压
-extern uint16 battI;                    // BMS电流(tcp上传)
-extern uint16 bmsHwVersion;
-extern uint32 bmsSwVersion;
-extern uint16 battPackVol;              // bms电压
-
-extern uint16 maxCellVol;               //最大单体电压
-extern uint16 minCellVol;               //最小单体电压
-extern uint16 socd_pct_vcuSoc;          // soc(tcp上传,精度0.1)
-extern uint16 sohd_pct_bcuSoh;          // soh(tcp上传,精度0.1)
-extern uint32 battBalanceoInfo;
-extern uint32 battProtectState;         // bms保护状态
-extern uint32 battWarningState;         // bms告警状态
-extern uint8 AvgBattTemp;               //平均单体温度
-extern uint8 battCellTemp[BMS_TEMPNUM]; //电池温度
-extern uint8 Battdesigncap;             //电池包设计容量
-extern uint8 battHeatEnableState;       // bms加热使能状态
-extern uint8 battMOSSwitchState;        // bms mos开关状态
-extern uint8 battSOC;                   // bms发送soc
-extern uint8 battSOH;                   // bms发送soh
-extern uint8 battWorkState;             // bms工作状态
-extern uint8 BmsOtherTemp;              // BMS其他温度
-extern uint8 maxCellTemp;               //最大单体温度
-extern uint8 minCellTemp;               //最小单体温度
-extern uint8 OtherTemp;                 //通讯模块其他温度
-extern uint8 battHeatState ;
-extern uint8 battFanState ;
-extern uint8 battRelayState ;
-extern uint8 battConverState ;
-extern uint8 battSeparateEnable ;
-extern uint8 battSeparateEnableState ;
-extern uint16 ErrorArray[5];
-#endif
 /*以下变量均为App_CAN相关变量*/
 #ifdef APP_CAN_ENABLE
 extern uint16 bmsHwVersion;

+ 0 - 3
src/AppTaskCan.h

@@ -12,11 +12,8 @@
 #include "AppFuncLib.h"
 #include "UDSTask.h"
 #include "Hal_Wdg.h"
-#ifdef APP_CAN_ENABLE
 void BcuDecodeFunction(uint32 ID, uint8 *rawData);
 void BcuRxDiagnose(void);
 void BcuRxMsgSetInvalidValue(uint32 ID);
 void CanTask(void *pvParameters);
-#endif
-
 #endif /* APPTASKCAN_H_ */

+ 0 - 303
src/AppTaskUart0.c

@@ -5,307 +5,4 @@
  *      Author: QiXiang_CHENJIE
  */
 #include "AppTaskUart0.h"
-#ifdef APP_UART0_ENABLE
-static process_Uart0 gProcess_Uart0_Task = PROCESS_UART_STATE_IDLE;
-#define PROC_UART0_STATE_SWITCH(a) (gProcess_Uart0_Task = a)
-bool bmsCellInfoDecode(uint8 *dataPtr);
-bool bmsOtherInfoDecode(uint8 *dataPtr);
-void Uart0Task(void *pvParameters)
-{
-	(void)pvParameters;
-	UartQueryType Uart0AskMsg;
-	uint16 Reg_Num = 0;
-	uint16 RegAddrBegin = 0;
-	uint16 CRC_chk_buffer = 0;
-	uint16 pReadLen = 0;
-	UartAnsType UartAnsData;
-	static uint8 writecounter = 0;
-	uint16 UartNoDataReadCounter = 0;
-	while (1)
-	{
-		switch (gProcess_Uart0_Task)
-		{
-		case PROCESS_UART_STATE_IDLE:
-		{
-			vTaskDelay(pdMS_TO_TICKS(10));
-			if (TimerCounter % 1000 == 0)
-			{
-				PROC_UART0_STATE_SWITCH(PROCESS_UART_STATE_READ);
-			}
-			else
-			{
-				PROC_UART0_STATE_SWITCH(PROCESS_UART_STATE_WRITE);
-			}
-			break;
-		}
-		case PROCESS_UART_STATE_READ:
-		{
-			/*电压电流数据读取(第一次读取)*/
-			pReadLen = 0;
-			Dio_FlipChannel(DioConf_DioChannel_PTE1_GPIO_OUT_MCU_LED2);
-			RegAddrBegin = 0x00;
-			Reg_Num =AppDataInfo.BattCellCount + 3;
-			Uart0AskMsg.Bms_Address = BMS_ADDRESS_CODE;
-			Uart0AskMsg.Bms_Funcode = UART_READ_CODE;
-			Uart0AskMsg.Reg_Begin_H = RegAddrBegin>>8;
-			Uart0AskMsg.Reg_Begin_L = RegAddrBegin;
-			Uart0AskMsg.Reg_Num_H = Reg_Num >> 8;
-			Uart0AskMsg.Reg_Num_L = Reg_Num;
-			CRC_chk_buffer = crc_chk((uint8 *)&Uart0AskMsg, 6);
-			Uart0AskMsg.CRC_L = CRC_chk_buffer;
-			Uart0AskMsg.CRC_H = CRC_chk_buffer >> 8;
-			memset(RX_Buffer[UART_LPUART0],0x00,sizeof(RX_Buffer[UART_LPUART0]));
-			UART_Query_Data(UART_LPUART0,UART_LPUART0,(uint8 *)&Uart0AskMsg,sizeof(Uart0AskMsg),RX_Buffer[UART_LPUART0], &pReadLen,500);
-			if (pReadLen > 0)
-			{
-				uint16 CrcChkGet = 0xffff;
-				uint16 CrcChkCal = 0x0000;
-				memcpy((uint8 *)(&UartAnsData),RX_Buffer[UART_LPUART0],0x03);
-				UartAnsData.DataPtr = (uint8 *)(&RX_Buffer[UART_LPUART0][3]);
-				CrcChkCal = crc_chk(RX_Buffer[UART_LPUART0], pReadLen-2);
-				CrcChkGet = (uint16)((RX_Buffer[UART_LPUART0][pReadLen-1]<<8)|(RX_Buffer[UART_LPUART0][pReadLen-2]));
-				if(CrcChkCal==CrcChkGet)
-				{
-					bmsCellInfoDecode(UartAnsData.DataPtr);
-					UartNoDataReadCounter = 0;
-				}
-			}
-			else
-			{
-				UartNoDataReadCounter++;
-			}
-			/*温度及其他状态信息读取(第二次读取)*/
-			pReadLen = 0;
-			RegAddrBegin = 0x03 + AppDataInfo.BattCellCount;
-			Reg_Num = 0x1B + AppDataInfo.BattTempCount; //读取的寄存器数据,暂定,分开读取
-			Uart0AskMsg.Bms_Address = BMS_ADDRESS_CODE;
-			Uart0AskMsg.Bms_Funcode = UART_READ_CODE;
-			Uart0AskMsg.Reg_Begin_H = RegAddrBegin>>8;
-			Uart0AskMsg.Reg_Begin_L = RegAddrBegin;
-			Uart0AskMsg.Reg_Num_H = Reg_Num >> 8;
-			Uart0AskMsg.Reg_Num_L = Reg_Num;
-			CRC_chk_buffer = crc_chk((uint8 *)&Uart0AskMsg, 6);
-			Uart0AskMsg.CRC_L = CRC_chk_buffer;
-			Uart0AskMsg.CRC_H = CRC_chk_buffer >> 8;
-			/*RS485查询命令需要使能
-			Dio_WriteChannel(DioConf_DioChannel_PTB4_GPIO_OUT_MCU_RS485_EN, STD_ON);
-			UART_Send_Data(UART_LPUART0, (uint8 *)&Uart0AskMsg, sizeof(Uart0AskMsg), 1000);
-			Dio_WriteChannel(DioConf_DioChannel_PTB4_GPIO_OUT_MCU_RS485_EN, STD_OFF);
-			memset(RX_Buffer[UART_LPUART0], 0x00, sizeof(RX_Buffer[UART_LPUART0]));
-			UART_Receive_Data(UART_LPUART0, RX_Buffer[UART_LPUART0], &pReadLen, 1000);
-			Dio_WriteChannel(DioConf_DioChannel_PTB4_GPIO_OUT_MCU_RS485_EN, STD_ON);
-			*/
-			/*TTL直连可以直接查询*/
-			memset(RX_Buffer[UART_LPUART0],0x00,sizeof(RX_Buffer[UART_LPUART0]));
-			UART_Query_Data(UART_LPUART0,UART_LPUART0,(uint8 *)&Uart0AskMsg,sizeof(Uart0AskMsg),RX_Buffer[UART_LPUART0], &pReadLen,500);
-			if (pReadLen > 0)
-			{
-				uint16 CrcChkGet = 0xffff;
-				uint16 CrcChkCal = 0x0000;
-				memcpy((uint8 *)(&UartAnsData),RX_Buffer[UART_LPUART0],0x03);
-				UartAnsData.DataPtr = (uint8 *)(&RX_Buffer[UART_LPUART0][3]);
-				CrcChkCal = crc_chk(RX_Buffer[UART_LPUART0], pReadLen-2);
-				CrcChkGet = (uint16)((RX_Buffer[UART_LPUART0][pReadLen-1]<<8)|(RX_Buffer[UART_LPUART0][pReadLen-2]));
-				if(CrcChkCal==CrcChkGet)
-				{
-					bmsOtherInfoDecode(UartAnsData.DataPtr);
-					UartNoDataReadCounter = 0;
-				}
-			}
-			else
-			{
-				UartNoDataReadCounter++;
-			}
-			//没有读到数据时的默认值
-			if(UartNoDataReadCounter>20)
-			{
-				memset(RX_Buffer[UART_LPUART0],0x00,sizeof(RX_Buffer[UART_LPUART0]));
-				memcpy((uint8 *)(&UartAnsData),RX_Buffer[UART_LPUART0],0x03);
-				UartAnsData.DataPtr = (uint8 *)(&RX_Buffer[UART_LPUART0][3]);
-				bmsCellInfoDecode(UartAnsData.DataPtr);
-				bmsOtherInfoDecode(UartAnsData.DataPtr);
-				PutErrorNum(ErrorArray, sizeof(ErrorArray)/2, 1);
-			}
-			PROC_UART0_STATE_SWITCH(PROCESS_UART_STATE_IDLE);
-			break;
-		}
-		case PROCESS_UART_STATE_WRITE:
-		{
-			if(battSeparateEnable)//最多重新写5次
-			{
-				uint16 RegAddress = 0;
-				uint16 CRC_chk_buffer = 0;
-				uint8 WriteData[2] = {0x00,0x00};
-				if(battSeparateEnableState)
-				{
-					setbit(WriteData[1],7);
-				}
-				else
-				{
-					clrbit(WriteData[1],7);
-				}
-				RegAddress = 0x1B + AppDataInfo.BattCellCount + AppDataInfo.BattTempCount;
-				UartWriteMsgType Uart_Write_Msg;
-				Uart_Write_Msg.Bms_Address = BMS_ADDRESS_CODE;
-				Uart_Write_Msg.Bms_Funcode = UART_WRITE_CODE;
-				Uart_Write_Msg.Reg_Begin_H = RegAddress >> 8;
-				Uart_Write_Msg.Reg_Begin_L = RegAddress;
-				Uart_Write_Msg.Reg_Num_H = 0x00;
-				Uart_Write_Msg.Reg_Num_L = 0x01;
-				Uart_Write_Msg.Data_Count = 0x02; //要写入的字节数
-				memcpy(Uart_Write_Msg.Data, WriteData, 2);
-				CRC_chk_buffer = crc_chk((uint8 *)&Uart_Write_Msg, sizeof(Uart_Write_Msg) - 2);
-				Uart_Write_Msg.CRC_L = CRC_chk_buffer;
-				Uart_Write_Msg.CRC_H = CRC_chk_buffer >> 8;
-				UART_Query_Data(UART_LPUART0,UART_LPUART0,(uint8 *)&Uart_Write_Msg,sizeof(Uart_Write_Msg),RX_Buffer[UART_LPUART0], &pReadLen,500);
-				if (pReadLen>0&&RX_Buffer[UART_LPUART0][1] == 0x10)
-				{
-					writecounter = 0;
-					battSeparateEnable = 0;
-				}
-				writecounter++;
-			}
-			if(writecounter>=5)
-			{
-				battSeparateEnable = 0;
-				writecounter = 0;
-			}
-			PROC_UART0_STATE_SWITCH(PROCESS_UART_STATE_IDLE);
-			break;
-		}
-		case PROCESS_UART_STATE_SLEEP:
-		{
-			break;
-		}
-		default:
-			break;
-		}
-	}
-}
-bool bmsCellInfoDecode(uint8 *dataPtr) //根据串口协议确定的解码函数,电压电流解码
-{
-	uint8 i = 0;
-	sint8 BattCurrentNegFlag = 1;
-	uint16 Batt_current;
-	uint8 BATT_CELL_VOL_NUM = 0, BATT_TEMP_NUM = 0;
-	uint32 Battsumvoltage = 0;
-	BATT_CELL_VOL_NUM = (dataPtr[(0x00) * 2] << 8) | (dataPtr[(0x00) * 2 + 1]);
-	BATT_TEMP_NUM = ((dataPtr[(0x01) * 2] << 8) | (dataPtr[(0x01) * 2 + 1])) - BmsOtherTemp;
-	if (BATT_CELL_VOL_NUM != AppDataInfo.BattCellCount || BATT_TEMP_NUM != AppDataInfo.BattTempCount)
-	{
-		BATT_CELL_VOL_NUM = AppDataInfo.BattCellCount;
-		BATT_TEMP_NUM = AppDataInfo.BattTempCount;
-	}
-	Batt_current = (dataPtr[(0x02 + BATT_CELL_VOL_NUM) * 2] << 8) | (dataPtr[(0x02 + BATT_CELL_VOL_NUM) * 2 + 1]);
-	//原始数据:充电为负,放电为正
-	if (Batt_current < 0x8000) //充电过程
-	{
-		if (Batt_current > 0x8000) // 数据为负
-		{
-			//求补码,结果为负
-			Batt_current = (uint16)((uint16)(~(Batt_current)) + 1);
-			Batt_current = Batt_current / 10;
-			BattCurrentNegFlag = -1;
-		}
-		else
-		{
-			//源码,结果为负
-			Batt_current = Batt_current / 10;
-			BattCurrentNegFlag = -1;
-		}
-	}
-	else //放电过程
-	{
-		if (Batt_current > 0x8000) // 数据为负
-		{
-			//求补码,结果为正
-			Batt_current = (uint16)((uint16)(~(Batt_current)) + 1);
-			Batt_current = Batt_current / 10;
-			BattCurrentNegFlag = 1;
-		}
-		else
-		{
-			//源码,结果为正
-			Batt_current = Batt_current / 10;
-			BattCurrentNegFlag = 1;
-		}
-	}
-	battI = Batt_current * BattCurrentNegFlag + 0x2710;
-	// sint16 BattI_Temp = 0;//做电压补偿需要的参数
-	// BattI_Temp = Batt_current * BattCurrentNegFlag;
-	for (i = 0; i < BATT_CELL_VOL_NUM; i++)
-	{
-		//battCellU[i] = ((dataPtr[(0x02 + i) * 2] << 8) | dataPtr[(0x02 + i) * 2 + 1]) + (INT16)(cmnm_R_voloffset[i] * BattI_Temp / 10000);//不使用电压补偿
-		battCellU[i] = ((dataPtr[(0x02 + i) * 2] << 8) | dataPtr[(0x02 + i) * 2 + 1]);
-		Battsumvoltage = Battsumvoltage + battCellU[i];
-	}
-	avrgCellVol = Battsumvoltage / BATT_CELL_VOL_NUM;
-	return true;
-}
-bool bmsOtherInfoDecode(uint8 *dataPtr)//其他数据解析
-{
-	uint8 TEMP_NUM = 0, temp = 0;
 
-	sint8 OtherInfoAddrOffset = -3;//其他数据解析的起始位置改变,需要向前减3
-	TEMP_NUM = AppDataInfo.BattTempCount + BmsOtherTemp;
-	 bmsHwVersion = dataPtr[(0x08 + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1];
-	 bmsSwVersion = dataPtr[(0x08 + OtherInfoAddrOffset + TEMP_NUM) * 2];
-
-	temp = ((dataPtr[(0x09 + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1]) >> 1) & 0x03;
-	battMOSSwitchState = ((temp & 0x01) << 1) | ((temp & 0x02) >> 1);
-	if (battSeparateEnableState==1)
-	{
-		battMOSSwitchState = battMOSSwitchState | (0x01 << 2);
-	}
-	else
-	{
-		battMOSSwitchState = battMOSSwitchState | (0x00 << 2);
-	}
-	battSOC = dataPtr[(0x0B + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1];
-	battSOH = dataPtr[(0x0C + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1];
-	Battdesigncap = (dataPtr[(0x0E + OtherInfoAddrOffset + TEMP_NUM) * 2]) << 24 | (dataPtr[(0x0E + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1]) << 16 | (dataPtr[(0x0F + OtherInfoAddrOffset + TEMP_NUM) * 2]) << 8 | (dataPtr[(0x0F + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1]);
-	battPackVol = ((dataPtr[(0x18 + OtherInfoAddrOffset + TEMP_NUM) * 2]) << 8 | (dataPtr[(0x18 + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1])) / 10; // uint 100mV
-	maxCellVol = (dataPtr[(0x19 + OtherInfoAddrOffset + TEMP_NUM) * 2] << 8) | dataPtr[(0x19 + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1];
-	minCellVol = (dataPtr[(0x1A + OtherInfoAddrOffset + TEMP_NUM) * 2] << 8) | dataPtr[(0x1A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1];
-	for (uint8 i = 0; i < AppDataInfo.BattTempCount; i++)
-	{
-		battCellTemp[i] = dataPtr[(0x06 + OtherInfoAddrOffset + i) * 2 + 1];
-	}
-	battWorkState = (dataPtr[(0x03 + OtherInfoAddrOffset) * 2 + 1]) & 0x03; //电池状态(原始数据),0表示静置,1表示放电,2表示充电
-	//状态量上传
-	battHeatState = getbit(dataPtr[(0x09 + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],5);
-	battFanState = getbit(dataPtr[(0x09 + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],3);
-	battRelayState = getbit(dataPtr[(0x09 + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],4);
-	battConverState = getbit(dataPtr[(0x09 + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],6);
-	battSeparateEnableState = getbit(dataPtr[(0x1B + OtherInfoAddrOffset + TEMP_NUM) * 2],7);
-	//故障状态映关系(先完成告警状态简单上传)
-	uint8 ErrorArrayTemp[32] ={0};
-	uint8 ErrorArrayNumTemp[32]={81,87,83,89,97,99,132,131,134,84,90,82,88,135,136,98,100};
-	ErrorArrayTemp[0] = getbit(dataPtr[(0x03 + OtherInfoAddrOffset) * 2],0);//电芯电压过高切断告警-0-81
-	ErrorArrayTemp[1] = getbit(dataPtr[(0x03 + OtherInfoAddrOffset) * 2],1);//总压过高切断告警-1-87
-	ErrorArrayTemp[2] = getbit(dataPtr[(0x04 + OtherInfoAddrOffset) * 2 + 1],0);//电芯电压过低切断告警2-83
-	ErrorArrayTemp[3] = getbit(dataPtr[(0x04 + OtherInfoAddrOffset) * 2 + 1],1);//总压过低切断告警3-89
-	ErrorArrayTemp[4] = getbit(dataPtr[(0x04 + OtherInfoAddrOffset) * 2],4);//单节温度过高切断4-97
-	ErrorArrayTemp[5] = getbit(dataPtr[(0x04 + OtherInfoAddrOffset) * 2],5);//单节温度过低切断5-99
-	ErrorArrayTemp[6] = getbit(dataPtr[(0x05 + OtherInfoAddrOffset) * 2 + 1],1);//放电电流切断6-132
-	ErrorArrayTemp[7] = getbit(dataPtr[(0x05 + OtherInfoAddrOffset) * 2 + 1],2);//充电电流切断7-131
-	ErrorArrayTemp[8] = getbit(dataPtr[(0x05 + OtherInfoAddrOffset) * 2 + 1],3);//BTU连接告警8-134
-	ErrorArrayTemp[9] = getbit(dataPtr[(0x0A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],0);//单节电压下限告警9-84
-	ErrorArrayTemp[10] = getbit(dataPtr[(0x0A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],1);//组电压下限告警10-90
-	ErrorArrayTemp[11] = getbit(dataPtr[(0x0A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],2);//单节电压上限告警11-82
-	ErrorArrayTemp[12] = getbit(dataPtr[(0x0A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],3);//组单节电压上限告警12-88
-	ErrorArrayTemp[13] = getbit(dataPtr[(0x0A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],4);//放电电流告警13-135
-	ErrorArrayTemp[14] = getbit(dataPtr[(0x0A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],5);//充电电流告警14-136
-	ErrorArrayTemp[15] = getbit(dataPtr[(0x0A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],6);//单节温度上限告警15-98
-	ErrorArrayTemp[16] = getbit(dataPtr[(0x0A + OtherInfoAddrOffset + TEMP_NUM) * 2 + 1],7);//单节温度下线告警16-100
-	for(uint8 i=0,j=0;(i<32&&j<5);i++)
-	{
-		if(ErrorArrayTemp[i]==1)
-		{
-			PutErrorNum(ErrorArray, sizeof(ErrorArray)/2, ErrorArrayNumTemp[i]);
-			j++;
-		}
-	}
-	return true;
-}
-#endif

+ 0 - 47
src/AppTaskUart0.h

@@ -10,51 +10,4 @@
 #include "hal_adapter.h"
 #include "AppFunclib.h"
 #include "AppGlobalVar.h"
-#ifdef APP_UART0_ENABLE
-#define BMS_ADDRESS_CODE 0x01
-#define UART_READ_CODE 0x03
-#define UART_WRITE_CODE 0x10
-#define UART_ENCRYPT_CODE 0x05
-#define UART_WRITE_FLAG 0x01
-#define UART_READ_FLAG 0x00
-void Uart0Task(void *pvParameters);
-typedef struct _UartAnsType
-{
-	uint8 BmsAdd;
-	uint8 FunCode;
-	uint8 Datalen;
-    uint8 *DataPtr;
-}UartAnsType;
-typedef enum
-{
-    PROCESS_UART_STATE_IDLE = 0,
-    PROCESS_UART_STATE_READ,
-	PROCESS_UART_STATE_WRITE,
-    PROCESS_UART_STATE_SLEEP
-} process_Uart0;
-typedef struct _UartQueryType
-{
-    uint8 Bms_Address;
-    uint8 Bms_Funcode;
-    uint8 Reg_Begin_H;
-    uint8 Reg_Begin_L;
-    uint8 Reg_Num_H;
-    uint8 Reg_Num_L;
-    uint8 CRC_L;
-    uint8 CRC_H;
-} UartQueryType;
-typedef struct _UartWriteMsgType
-{
-	uint8 Bms_Address;
-	uint8 Bms_Funcode;
-	uint8 Reg_Begin_H;
-    uint8 Reg_Begin_L;
-    uint8 Reg_Num_H;
-    uint8 Reg_Num_L;
-    uint8 Data_Count;
-    uint8 Data[2];
-    uint8 CRC_L;
-    uint8 CRC_H;
-} UartWriteMsgType;
-#endif
 #endif /* APPTASKUART0_H_ */

+ 3 - 134
src/AppTaskUart1.c

@@ -642,21 +642,6 @@ void TcpDataEncode(uint32 *PtrSendAddr, uint16 *SendLen)
 	{
 		DataIdx = VerMsg; //版本信息发送
 	}
-#ifdef APP_UART0_ENABLE
-	else if (TcpSendTimeCounter % 10 == 0)
-	{
-		DataIdx = BattMsg; //电池信息发送
-	}
-	else if ((TcpSendTimeCounter+1) % 10 == 0)
-	{
-		DataIdx = 0x83; //储能开关信息发送
-	}
-	else if (TcpSendTimeCounter % 240 == 0)
-	{
-		DataIdx = GpsMsg; //定位信息发送
-	}
-#endif
-#ifdef APP_CAN_ENABLE
 	else if (TcpSendTimeCounter % 10 == 0)
 	{
 		DataIdx = TruckBattMsg; //电池信息发送
@@ -673,7 +658,6 @@ void TcpDataEncode(uint32 *PtrSendAddr, uint16 *SendLen)
 	{
 		DataIdx = GpsMsg; //定位信息发送
 	}
-#endif
 	else
 	{
 		*SendLen = 0;
@@ -812,120 +796,6 @@ void TcpDataEncode(uint32 *PtrSendAddr, uint16 *SendLen)
 		*PtrSendAddr = (uint32)SendBuffer;
 		break;
 	}
-#ifdef APP_UART0_ENABLE
-	case 0x80:
-	{
-		uint16 ErrorTemp;
-		ErrorTemp = GetErrorNum(ErrorArray,sizeof(ErrorArray)/2);
-		uint8 ProtocolHeaderLen = 25;																					  //电池信息协议头部加校验码长度,此长度不更改
-		uint8 ProtocolFixedLen = 60;																					  //电池信息协议固定总长度 如协议新增,需要更改此长度
-		uint16 ProtocolFluctedLen = AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount + BmsOtherTemp + OtherTemp; //电池信息协议变动长度
-		uint16 DataLen;
-		*SendLen = ProtocolFixedLen + ProtocolFluctedLen;
-		SendBuffer = malloc(*SendLen);
-		if (SendBuffer == NULL)
-		{
-			return;
-		}
-		*(SendBuffer + 0) = TCP_START_SYM1;									 //起始码-1
-		*(SendBuffer + 1) = TCP_START_SYM2;									 //起始码-2
-		*(SendBuffer + 2) = TCP_CMD_SYM;									 //命令标识-3
-		*(SendBuffer + 3) = TCP_ANS_SYM;									 //应答标识-4
-		memcpy(SendBuffer + 4, TcpbattSN, BATT_SN_LEN);						 // SN码 5-21
-		*(SendBuffer + 21) = TCP_ENCPT_DISABLE;								 //加密方式-22
-		DataLen = ProtocolFixedLen + ProtocolFluctedLen - ProtocolHeaderLen; //电池信息单元协议固定长度
-		*(SendBuffer + 22) = (DataLen >> 8) & 0xFF;							 //数据长度H-23
-		*(SendBuffer + 23) = DataLen & 0xFF;								 //数据长度L-24
-		*(SendBuffer + 24) = (UTC8TimeTcp.year) & 0xFF;						 // year-25
-		*(SendBuffer + 25) = UTC8TimeTcp.month & 0xFF;						 // month-26
-		*(SendBuffer + 26) = UTC8TimeTcp.day & 0xFF;						 // day-27
-		*(SendBuffer + 27) = UTC8TimeTcp.hour & 0xFF;						 // hour-28
-		*(SendBuffer + 28) = UTC8TimeTcp.minute & 0xFF;						 // mins-29
-		*(SendBuffer + 29) = UTC8TimeTcp.second & 0xFF;						 // sec-30
-		*(SendBuffer + 30) = DataIdx;										 //电池信息发送-31
-		*(SendBuffer + 31) = (UTC8TimeTcp.year) & 0xFF;						 // year-32
-		*(SendBuffer + 32) = UTC8TimeTcp.month & 0xFF;						 // month-33
-		*(SendBuffer + 33) = UTC8TimeTcp.day & 0xFF;						 // day-34
-		*(SendBuffer + 34) = UTC8TimeTcp.hour & 0xFF;						 // hour-35
-		*(SendBuffer + 35) = UTC8TimeTcp.minute & 0xFF;						 // mins-36
-		*(SendBuffer + 36) = UTC8TimeTcp.second & 0xFF;						 // sec-37
-		*(SendBuffer + 37) = CSQValue;										 //信号强度-38
-		*(SendBuffer + 38) = 0;												 //故障等级-39
-		*(SendBuffer + 39) = ErrorTemp >> 8;								 //故障代码H-40
-		*(SendBuffer + 40) = ErrorTemp & 0xFF;								 //故障代码L-41
-		*(SendBuffer + 41) = battI >> 8;									 //电流-42
-		*(SendBuffer + 42) = battI & 0xFF;									 //电流-43
-		*(SendBuffer + 43) = battPackVol >> 8;								 //电压-44
-		*(SendBuffer + 44) = battPackVol & 0xFF;							 //电压-45
-		*(SendBuffer + 45) = battPackVol >> 8;								 //电压-46
-		*(SendBuffer + 46) = battPackVol & 0xFF;							 //电压-47
-		*(SendBuffer + 47) = battMOSSwitchState;							 // mos状态-48
-		*(SendBuffer + 48) = (uint8)(socd_pct_vcuSoc / 10);					 // soc-49
-		*(SendBuffer + 49) = (uint8)(sohd_pct_bcuSoh / 10);					 // soh-50
-		*(SendBuffer + 50) = (battBalanceoInfo >> 24) & 0xFF;
-		*(SendBuffer + 51) = (battBalanceoInfo >> 16) & 0xFF;
-		*(SendBuffer + 52) = (battBalanceoInfo >> 8) & 0xFF;
-		*(SendBuffer + 53) = battBalanceoInfo & 0xFF;		  //均衡状态-51-54
-		*(SendBuffer + 54) = AppDataInfo.BattCellCount;		  //电压个数-55
-		for (uint8 i = 0; i < AppDataInfo.BattCellCount; i++) //单体电压
-		{
-			*(SendBuffer + 54 + i * 2 + 1) = (battCellU[i] >> 8) & 0xFF;
-			*(SendBuffer + 54 + i * 2 + 2) = battCellU[i] & 0xFF;
-		}
-		*(SendBuffer + 55 + AppDataInfo.BattCellCount * 2) = AppDataInfo.BattTempCount;							   //模组温度个数
-		memcpy((SendBuffer + 55 + AppDataInfo.BattCellCount * 2 + 1), &battCellTemp, AppDataInfo.BattTempCount);   //模组温度
-		*(SendBuffer + 56 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount) = battWorkState;			   //电池工作状态
-		*(SendBuffer + 57 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount) = battHeatEnableState;	   //电池加热使能状态
-		*(SendBuffer + 58 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount) = BmsOtherTemp + OtherTemp; //其他温度个数
-		// *(SendBuffer + 58 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount + 1) = MOSTemp;																						  // mos温度
-		// *(SendBuffer + 58 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount + 2) = packTemp;																						  //环境温度
-		// *(SendBuffer + 58 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount + 3) = fastChargeTemp;																				  //快充温度
-		// *(SendBuffer + 58 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount + 4) = normalChargeTemp;																				  //慢充温度
-		// *(SendBuffer + 58 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount + 5) = heatTemp1;																						  //加热温度1
-		// *(SendBuffer + 58 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount + 6) = heatTemp2;																						  //加热温度2
-		*(SendBuffer + 59 + AppDataInfo.BattCellCount * 2 + AppDataInfo.BattTempCount + BmsOtherTemp + OtherTemp) = bcc_chk(SendBuffer, ProtocolFixedLen + ProtocolFluctedLen - 1); //校验码
-		*PtrSendAddr = (uint32)SendBuffer;
-		break;
-	}
-	case 0x83://储能场景的开关信息
-	{
-		StorageInfoToTcp StorageInfo;
-		*SendLen = sizeof(StorageInfo);
-		SendBuffer = malloc(*SendLen);
-		uint16 DataLen = 0;
-		DataLen = (uint16)sizeof(StorageInfo.StorageMsg);
-		StorageInfo.startSymbol[0] = TCP_START_SYM1;
-		StorageInfo.startSymbol[1] = TCP_START_SYM2;
-		StorageInfo.cmdSymbol = TCP_CMD_SYM;
-		StorageInfo.ansSymbol = TCP_ANS_SYM;
-		memcpy(StorageInfo.SN, TcpbattSN, BATT_SN_LEN);
-		StorageInfo.encryptMethod = TCP_ENCPT_DISABLE; // not encrypt
-		StorageInfo.dataLength[0] = (DataLen >> 8) & 0xFF;
-		StorageInfo.dataLength[1] = DataLen & 0xFF;
-		StorageInfo.StorageMsg.sendTimeUTC[0] = (UTC8TimeTcp.year) & 0xFF; // year
-		StorageInfo.StorageMsg.sendTimeUTC[1] = UTC8TimeTcp.month & 0xFF;	// month
-		StorageInfo.StorageMsg.sendTimeUTC[2] = UTC8TimeTcp.day & 0xFF;	// day
-		StorageInfo.StorageMsg.sendTimeUTC[3] = UTC8TimeTcp.hour & 0xFF;	// hour
-		StorageInfo.StorageMsg.sendTimeUTC[4] = UTC8TimeTcp.minute & 0xFF; // mins
-		StorageInfo.StorageMsg.sendTimeUTC[5] = UTC8TimeTcp.second & 0xFF; // sec
-		StorageInfo.StorageMsg.msgMark = DataIdx;
-		StorageInfo.StorageMsg.msgCollectionTimeUTC[0] = (UTC8TimeTcp.year) & 0xFF; // year
-		StorageInfo.StorageMsg.msgCollectionTimeUTC[1] = UTC8TimeTcp.month & 0xFF;	 // month
-		StorageInfo.StorageMsg.msgCollectionTimeUTC[2] = UTC8TimeTcp.day & 0xFF;	 // day
-		StorageInfo.StorageMsg.msgCollectionTimeUTC[3] = UTC8TimeTcp.hour & 0xFF;	 // hour
-		StorageInfo.StorageMsg.msgCollectionTimeUTC[4] = UTC8TimeTcp.minute & 0xFF; // mins
-		StorageInfo.StorageMsg.msgCollectionTimeUTC[5] = UTC8TimeTcp.second & 0xFF;
-		StorageInfo.StorageMsg.RelayState = battRelayState;
-		StorageInfo.StorageMsg.FanState = battFanState;
-		StorageInfo.StorageMsg.HeatState = battHeatState;
-		StorageInfo.StorageMsg.ConvertState = battConverState;
-		StorageInfo.CRC = bcc_chk((uint8 *)&StorageInfo, sizeof(StorageInfo) - 1);
-		memcpy(SendBuffer, &StorageInfo, sizeof(StorageInfo));
-		*PtrSendAddr = (uint32)SendBuffer;
-		break;
-	}
-#endif
-#ifdef APP_CAN_ENABLE
 	case 0x90:
 	{
 		*SendLen = 0x52;
@@ -1118,7 +988,6 @@ void TcpDataEncode(uint32 *PtrSendAddr, uint16 *SendLen)
 		*PtrSendAddr = (uint32)SendBuffer;
 		break;
 	}
-#endif
 	default:
 		break;
 	}
@@ -1169,10 +1038,10 @@ static void TcpDataInfoRecvHandle(uint8 *DataRecv,uint16 DataRecvLen)
         if ((*(Ptr + 0) == TCP_START_SYM1) && (*(Ptr + 1) == TCP_START_SYM2)) //服务器起始信息
         {
             Tcp_Cmd = *(Ptr + 2); //命令标志
-//            if (*(Ptr + 3) == 0xFE)
-//            {
+            if (*(Ptr + 3) == 0xFE)
+            {
 //                TCPWorkState = 0x01;//需要暂停发送,进行命令应答的标志
-//            }
+            }
             switch (Tcp_Cmd)
             {
             case TCP_QUERY_SYM:

+ 0 - 5
src/main.c

@@ -160,12 +160,7 @@ int main(void)
 
 	xTaskCreate(MainTask, (const char *const)"MainTask", 128, (void *)0, main_TASK_PRIORITY + 3, NULL);
 	xTaskCreate(Uart_4G_Task, (const char *const)"Uart_4G_Task", 2048, (void *)0, main_TASK_PRIORITY + 0, NULL);
-#ifdef APP_UART0_ENABLE
-	xTaskCreate(Uart0Task, (const char *const)"Uart0_Bms_Task", 256, (void *)0, main_TASK_PRIORITY + 1, NULL);
-#endif
-#ifdef APP_CAN_ENABLE
 	xTaskCreate(CanTask, (const char *const)"CanTask", 512, (void *)0, main_TASK_PRIORITY + 2, NULL);
-#endif
 	xTaskCreate(GpsTask, (const char *const)"GpsTask", 512, (void *)0, main_TASK_PRIORITY + 1, NULL);
 	vTaskStartScheduler();
 	for (;;)