From f2e8c43e2ee9c7426c337e17bbeef0f4df07a82b Mon Sep 17 00:00:00 2001 From: hehaoyang <1109196436@qq.com> Date: Mon, 20 Nov 2023 10:20:45 +0800 Subject: [PATCH] =?UTF-8?q?V1.22=20=E5=8D=97=E4=BA=AC=E9=87=91=E9=BE=99CAN?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 445 +++++++++--------- GD32F103C8T6/App/User/Peripheral/Api/api.h | 2 +- .../App/User/Peripheral/CAN/can_parsing.c | 50 +- 3 files changed, 256 insertions(+), 241 deletions(-) diff --git a/.gitignore b/.gitignore index 4084d4f..8ea25c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,223 +1,222 @@ -WpfApp1/.vs/WpfApp1/FileContentIndex/7ce5a04a-68b0-4b93-a3a9-5ba64bbb8303.vsidx -WpfApp1/.vs/WpfApp1/v16/.suo -WpfApp1/.vs/WpfApp1/v17/.suo -WpfApp1/.vs/WpfApp1/v17/Preview/Browse.VC.db -WpfApp1/WpfApp1/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs -WpfApp1/WpfApp1/obj/Debug/App.g.cs -WpfApp1/WpfApp1/obj/Debug/App.g.i.cs -WpfApp1/WpfApp1/obj/Debug/DesignTimeResolveAssemblyReferences.cache -WpfApp1/WpfApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache -WpfApp1/WpfApp1/obj/Debug/MainWindow.baml -WpfApp1/WpfApp1/obj/Debug/MainWindow.g.cs -WpfApp1/WpfApp1/obj/Debug/MainWindow.g.i.cs -WpfApp1/WpfApp1/obj/Debug/SeniorWindow.g.i.cs -WpfApp1/WpfApp1/obj/Debug/WpfApp1_MarkupCompile.cache -WpfApp1/WpfApp1/obj/Debug/WpfApp1_MarkupCompile.i.cache -WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.AssemblyReference.cache -WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.CoreCompileInputs.cache -WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.FileListAbsolute.txt -WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.GenerateResource.cache -WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.SuggestedBindingRedirects.cache -WpfApp1/WpfApp1/obj/Debug/WpfApp1.exe -WpfApp1/WpfApp1/obj/Debug/WpfApp1.g.resources -WpfApp1/WpfApp1/obj/Debug/WpfApp1.pdb -WpfApp1/WpfApp1/obj/Debug/WpfApp1.Properties.Resources.resources -WpfApp1/WpfApp1/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll -WpfApp1/WpfApp1/bin/Debug/WpfApp1.exe -WpfApp1/WpfApp1/bin/Debug/WpfApp1.exe.config -WpfApp1/WpfApp1/bin/Debug/WpfApp1.pdb -GD32F103C8T6/App/Output/Debug/Exe/App.bin -GD32F103C8T6/App/Output/Debug/Exe/App.elf -GD32F103C8T6/App/Output/Debug/Exe/App.hex -GD32F103C8T6/App/Output/Debug/Exe/App.ind -GD32F103C8T6/App/Output/Debug/Exe/App.map -GD32F103C8T6/App/Output/Debug/Obj/App/ak517.d -GD32F103C8T6/App/Output/Debug/Obj/App/ak517.o -GD32F103C8T6/App/Output/Debug/Obj/App/api.d -GD32F103C8T6/App/Output/Debug/Obj/App/api.o -GD32F103C8T6/App/Output/Debug/Obj/App/app.d -GD32F103C8T6/App/Output/Debug/Obj/App/app.o -GD32F103C8T6/App/Output/Debug/Obj/App/can_parsing.d -GD32F103C8T6/App/Output/Debug/Obj/App/can_parsing.o -GD32F103C8T6/App/Output/Debug/Obj/App/can.d -GD32F103C8T6/App/Output/Debug/Obj/App/can.o -GD32F103C8T6/App/Output/Debug/Obj/App/delay.d -GD32F103C8T6/App/Output/Debug/Obj/App/delay.o -GD32F103C8T6/App/Output/Debug/Obj/App/diaodu.d -GD32F103C8T6/App/Output/Debug/Obj/App/diaodu.o -GD32F103C8T6/App/Output/Debug/Obj/App/fmc.d -GD32F103C8T6/App/Output/Debug/Obj/App/fmc.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_adc.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_adc.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_bkp.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_bkp.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_can.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_can.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_crc.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_crc.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dac.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dac.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dbg.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dbg.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dma.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dma.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_enet.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_enet.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_exmc.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_exmc.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_exti.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_exti.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_fmc.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_fmc.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_fwdgt.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_fwdgt.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_gpio.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_gpio.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_i2c.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_i2c.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_md_Vectors.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_md_Vectors.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_misc.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_misc.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_pmu.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_pmu.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_rcu.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_rcu.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_rtc.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_rtc.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_sdio.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_sdio.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_spi.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_spi.o -GD32F103C8T6/App/Output/Debug/Obj/App/GD32F10x_Startup.d -GD32F103C8T6/App/Output/Debug/Obj/App/GD32F10x_Startup.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_timer.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_timer.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_usart.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_usart.o -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_wwdgt.d -GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_wwdgt.o -GD32F103C8T6/App/Output/Debug/Obj/App/gpio.d -GD32F103C8T6/App/Output/Debug/Obj/App/gpio.o -GD32F103C8T6/App/Output/Debug/Obj/App/iap.d -GD32F103C8T6/App/Output/Debug/Obj/App/iap.o -GD32F103C8T6/App/Output/Debug/Obj/App/iic.d -GD32F103C8T6/App/Output/Debug/Obj/App/iic.o -GD32F103C8T6/App/Output/Debug/Obj/App/ir.d -GD32F103C8T6/App/Output/Debug/Obj/App/ir.o -GD32F103C8T6/App/Output/Debug/Obj/App/m62429.d -GD32F103C8T6/App/Output/Debug/Obj/App/m62429.o -GD32F103C8T6/App/Output/Debug/Obj/App/main.d -GD32F103C8T6/App/Output/Debug/Obj/App/main.o -GD32F103C8T6/App/Output/Debug/Obj/App/qgel50x.d -GD32F103C8T6/App/Output/Debug/Obj/App/qgel50x.o -GD32F103C8T6/App/Output/Debug/Obj/App/SEGGER_THUMB_Startup.d -GD32F103C8T6/App/Output/Debug/Obj/App/SEGGER_THUMB_Startup.o -GD32F103C8T6/App/Output/Debug/Obj/App/setting.d -GD32F103C8T6/App/Output/Debug/Obj/App/setting.o -GD32F103C8T6/App/Output/Debug/Obj/App/spi.d -GD32F103C8T6/App/Output/Debug/Obj/App/spi.o -GD32F103C8T6/App/Output/Debug/Obj/App/system_gd32f10x.d -GD32F103C8T6/App/Output/Debug/Obj/App/system_gd32f10x.o -GD32F103C8T6/App/Output/Debug/Obj/App/system.d -GD32F103C8T6/App/Output/Debug/Obj/App/system.o -GD32F103C8T6/App/Output/Debug/Obj/App/task.d -GD32F103C8T6/App/Output/Debug/Obj/App/task.o -GD32F103C8T6/App/Output/Debug/Obj/App/timer.d -GD32F103C8T6/App/Output/Debug/Obj/App/timer.o -GD32F103C8T6/App/Output/Debug/Obj/App/usart.d -GD32F103C8T6/App/Output/Debug/Obj/App/usart.o -GD32F103C8T6/App/Output/Debug/Obj/App/v58.d -GD32F103C8T6/App/Output/Debug/Obj/App/v58.o -GD32F103C8T6/App/Output/Debug/Obj/App/wdgt.d -GD32F103C8T6/App/Output/Debug/Obj/App/wdgt.o -GD32F103C8T6/Bootloader/Output/Debug/Exe/Bootloader.elf -GD32F103C8T6/Bootloader/Output/Debug/Exe/Bootloader.hex -GD32F103C8T6/Bootloader/Output/Debug/Exe/Bootloader.ind -GD32F103C8T6/Bootloader/Output/Debug/Exe/Bootloader.map -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/delay.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/delay.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_adc.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_adc.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_bkp.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_bkp.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_can.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_can.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_crc.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_crc.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dac.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dac.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dbg.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dbg.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dma.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dma.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_enet.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_enet.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_exmc.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_exmc.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_exti.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_exti.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_fmc.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_fmc.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_fwdgt.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_fwdgt.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_gpio.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_gpio.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_i2c.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_i2c.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_md_Vectors.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_md_Vectors.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_misc.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_misc.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_pmu.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_pmu.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_rcu.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_rcu.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_rtc.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_rtc.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_sdio.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_sdio.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_spi.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_spi.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/GD32F10x_Startup.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/GD32F10x_Startup.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_timer.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_timer.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_usart.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_usart.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_wwdgt.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_wwdgt.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/main.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/main.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/SEGGER_THUMB_Startup.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/SEGGER_THUMB_Startup.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system_gd32f10x.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system_gd32f10x.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/task.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/task.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/timer.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/timer.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/usart.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/usart.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/wdgt.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/wdgt.o -GD32F103C8T6/Bootloader/Bootloader_Debug.jlink -GD32F103C8T6/App/App_Debug.jlink -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/fmc.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/fmc.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gpio.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gpio.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/iap.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/iap.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/setting.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/setting.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/spi.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/spi.o -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system.d -GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system.o -GD32F103C8T6/GD32F10x.emSession -GD32F103C8T6/._GD32F10x.emProject -GD32F103C8T6/App/Output/Debug/Obj/App/v58-e8e109c7.o.tmp -WpfApp1/.vs/WpfApp1/FileContentIndex/294201ea-13b4-4ce6-87c7-fe11eac372a1.vsidx -GD32F103C8T6/GD32F10x.emSession -协议文档/~$通信协议说明.docx +WpfApp1/.vs/WpfApp1/FileContentIndex/7ce5a04a-68b0-4b93-a3a9-5ba64bbb8303.vsidx +WpfApp1/.vs/WpfApp1/v16/.suo +WpfApp1/.vs/WpfApp1/v17/.suo +WpfApp1/.vs/WpfApp1/v17/Preview/Browse.VC.db +WpfApp1/WpfApp1/obj/Debug/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs +WpfApp1/WpfApp1/obj/Debug/App.g.cs +WpfApp1/WpfApp1/obj/Debug/App.g.i.cs +WpfApp1/WpfApp1/obj/Debug/DesignTimeResolveAssemblyReferences.cache +WpfApp1/WpfApp1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +WpfApp1/WpfApp1/obj/Debug/MainWindow.baml +WpfApp1/WpfApp1/obj/Debug/MainWindow.g.cs +WpfApp1/WpfApp1/obj/Debug/MainWindow.g.i.cs +WpfApp1/WpfApp1/obj/Debug/SeniorWindow.g.i.cs +WpfApp1/WpfApp1/obj/Debug/WpfApp1_MarkupCompile.cache +WpfApp1/WpfApp1/obj/Debug/WpfApp1_MarkupCompile.i.cache +WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.AssemblyReference.cache +WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.CoreCompileInputs.cache +WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.FileListAbsolute.txt +WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.GenerateResource.cache +WpfApp1/WpfApp1/obj/Debug/WpfApp1.csproj.SuggestedBindingRedirects.cache +WpfApp1/WpfApp1/obj/Debug/WpfApp1.exe +WpfApp1/WpfApp1/obj/Debug/WpfApp1.g.resources +WpfApp1/WpfApp1/obj/Debug/WpfApp1.pdb +WpfApp1/WpfApp1/obj/Debug/WpfApp1.Properties.Resources.resources +WpfApp1/WpfApp1/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll +WpfApp1/WpfApp1/bin/Debug/WpfApp1.exe +WpfApp1/WpfApp1/bin/Debug/WpfApp1.exe.config +WpfApp1/WpfApp1/bin/Debug/WpfApp1.pdb +GD32F103C8T6/App/Output/Debug/Exe/App.bin +GD32F103C8T6/App/Output/Debug/Exe/App.elf +GD32F103C8T6/App/Output/Debug/Exe/App.hex +GD32F103C8T6/App/Output/Debug/Exe/App.ind +GD32F103C8T6/App/Output/Debug/Exe/App.map +GD32F103C8T6/App/Output/Debug/Obj/App/ak517.d +GD32F103C8T6/App/Output/Debug/Obj/App/ak517.o +GD32F103C8T6/App/Output/Debug/Obj/App/api.d +GD32F103C8T6/App/Output/Debug/Obj/App/api.o +GD32F103C8T6/App/Output/Debug/Obj/App/app.d +GD32F103C8T6/App/Output/Debug/Obj/App/app.o +GD32F103C8T6/App/Output/Debug/Obj/App/can_parsing.d +GD32F103C8T6/App/Output/Debug/Obj/App/can_parsing.o +GD32F103C8T6/App/Output/Debug/Obj/App/can.d +GD32F103C8T6/App/Output/Debug/Obj/App/can.o +GD32F103C8T6/App/Output/Debug/Obj/App/delay.d +GD32F103C8T6/App/Output/Debug/Obj/App/delay.o +GD32F103C8T6/App/Output/Debug/Obj/App/diaodu.d +GD32F103C8T6/App/Output/Debug/Obj/App/diaodu.o +GD32F103C8T6/App/Output/Debug/Obj/App/fmc.d +GD32F103C8T6/App/Output/Debug/Obj/App/fmc.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_adc.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_adc.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_bkp.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_bkp.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_can.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_can.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_crc.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_crc.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dac.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dac.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dbg.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dbg.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dma.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_dma.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_enet.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_enet.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_exmc.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_exmc.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_exti.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_exti.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_fmc.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_fmc.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_fwdgt.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_fwdgt.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_gpio.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_gpio.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_i2c.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_i2c.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_md_Vectors.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_md_Vectors.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_misc.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_misc.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_pmu.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_pmu.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_rcu.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_rcu.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_rtc.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_rtc.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_sdio.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_sdio.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_spi.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_spi.o +GD32F103C8T6/App/Output/Debug/Obj/App/GD32F10x_Startup.d +GD32F103C8T6/App/Output/Debug/Obj/App/GD32F10x_Startup.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_timer.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_timer.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_usart.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_usart.o +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_wwdgt.d +GD32F103C8T6/App/Output/Debug/Obj/App/gd32f10x_wwdgt.o +GD32F103C8T6/App/Output/Debug/Obj/App/gpio.d +GD32F103C8T6/App/Output/Debug/Obj/App/gpio.o +GD32F103C8T6/App/Output/Debug/Obj/App/iap.d +GD32F103C8T6/App/Output/Debug/Obj/App/iap.o +GD32F103C8T6/App/Output/Debug/Obj/App/iic.d +GD32F103C8T6/App/Output/Debug/Obj/App/iic.o +GD32F103C8T6/App/Output/Debug/Obj/App/ir.d +GD32F103C8T6/App/Output/Debug/Obj/App/ir.o +GD32F103C8T6/App/Output/Debug/Obj/App/m62429.d +GD32F103C8T6/App/Output/Debug/Obj/App/m62429.o +GD32F103C8T6/App/Output/Debug/Obj/App/main.d +GD32F103C8T6/App/Output/Debug/Obj/App/main.o +GD32F103C8T6/App/Output/Debug/Obj/App/qgel50x.d +GD32F103C8T6/App/Output/Debug/Obj/App/qgel50x.o +GD32F103C8T6/App/Output/Debug/Obj/App/SEGGER_THUMB_Startup.d +GD32F103C8T6/App/Output/Debug/Obj/App/SEGGER_THUMB_Startup.o +GD32F103C8T6/App/Output/Debug/Obj/App/setting.d +GD32F103C8T6/App/Output/Debug/Obj/App/setting.o +GD32F103C8T6/App/Output/Debug/Obj/App/spi.d +GD32F103C8T6/App/Output/Debug/Obj/App/spi.o +GD32F103C8T6/App/Output/Debug/Obj/App/system_gd32f10x.d +GD32F103C8T6/App/Output/Debug/Obj/App/system_gd32f10x.o +GD32F103C8T6/App/Output/Debug/Obj/App/system.d +GD32F103C8T6/App/Output/Debug/Obj/App/system.o +GD32F103C8T6/App/Output/Debug/Obj/App/task.d +GD32F103C8T6/App/Output/Debug/Obj/App/task.o +GD32F103C8T6/App/Output/Debug/Obj/App/timer.d +GD32F103C8T6/App/Output/Debug/Obj/App/timer.o +GD32F103C8T6/App/Output/Debug/Obj/App/usart.d +GD32F103C8T6/App/Output/Debug/Obj/App/usart.o +GD32F103C8T6/App/Output/Debug/Obj/App/v58.d +GD32F103C8T6/App/Output/Debug/Obj/App/v58.o +GD32F103C8T6/App/Output/Debug/Obj/App/wdgt.d +GD32F103C8T6/App/Output/Debug/Obj/App/wdgt.o +GD32F103C8T6/Bootloader/Output/Debug/Exe/Bootloader.elf +GD32F103C8T6/Bootloader/Output/Debug/Exe/Bootloader.hex +GD32F103C8T6/Bootloader/Output/Debug/Exe/Bootloader.ind +GD32F103C8T6/Bootloader/Output/Debug/Exe/Bootloader.map +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/delay.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/delay.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_adc.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_adc.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_bkp.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_bkp.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_can.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_can.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_crc.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_crc.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dac.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dac.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dbg.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dbg.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dma.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_dma.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_enet.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_enet.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_exmc.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_exmc.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_exti.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_exti.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_fmc.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_fmc.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_fwdgt.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_fwdgt.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_gpio.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_gpio.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_i2c.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_i2c.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_md_Vectors.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_md_Vectors.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_misc.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_misc.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_pmu.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_pmu.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_rcu.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_rcu.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_rtc.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_rtc.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_sdio.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_sdio.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_spi.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_spi.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/GD32F10x_Startup.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/GD32F10x_Startup.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_timer.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_timer.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_usart.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_usart.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_wwdgt.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gd32f10x_wwdgt.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/main.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/main.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/SEGGER_THUMB_Startup.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/SEGGER_THUMB_Startup.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system_gd32f10x.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system_gd32f10x.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/task.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/task.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/timer.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/timer.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/usart.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/usart.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/wdgt.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/wdgt.o +GD32F103C8T6/Bootloader/Bootloader_Debug.jlink +GD32F103C8T6/App/App_Debug.jlink +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/fmc.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/fmc.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gpio.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/gpio.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/iap.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/iap.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/setting.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/setting.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/spi.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/spi.o +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system.d +GD32F103C8T6/Bootloader/Output/Debug/Obj/Bootloader/system.o +GD32F103C8T6/GD32F10x.emSession +GD32F103C8T6/._GD32F10x.emProject +GD32F103C8T6/App/Output/Debug/Obj/App/v58-e8e109c7.o.tmp +WpfApp1/.vs/WpfApp1/FileContentIndex/294201ea-13b4-4ce6-87c7-fe11eac372a1.vsidx +协议文档/~$通信协议说明.docx \ No newline at end of file diff --git a/GD32F103C8T6/App/User/Peripheral/Api/api.h b/GD32F103C8T6/App/User/Peripheral/Api/api.h index 37d893a..e4e91f3 100644 --- a/GD32F103C8T6/App/User/Peripheral/Api/api.h +++ b/GD32F103C8T6/App/User/Peripheral/Api/api.h @@ -22,7 +22,7 @@ #define API_FRAME_RESPONSE (0x01) /* 响应帧 */ #define API_FRAME_NOTIFICATION (0x02) /* 通知帧 */ -#define SOFTWARE_VERSION ("V1.21") +#define SOFTWARE_VERSION ("V1.22") #define HARDWARE_VERSION ("V1.01") extern uint8_t api_upgrade_mode; diff --git a/GD32F103C8T6/App/User/Peripheral/CAN/can_parsing.c b/GD32F103C8T6/App/User/Peripheral/CAN/can_parsing.c index cc32072..a97ae89 100644 --- a/GD32F103C8T6/App/User/Peripheral/CAN/can_parsing.c +++ b/GD32F103C8T6/App/User/Peripheral/CAN/can_parsing.c @@ -73,28 +73,44 @@ void can_jinlong_parsing(uint32_t id, uint8_t *data, uint8_t *door_front, uint8_ { switch (id) { - case 0x18F0B117: + //case 0x18F0B117: + // /* 左转向 */ + // *turn_left = (data[1] & 0x01) == 0x01 ? 0 : 1; + // /* 右转向 */ + // *turn_right = (data[1] >> 1 & 0x01) == 0x01 ? 0 : 1; + + // /* 前门 */ + // if ((data[2] & 0x01) == 0x01) + // *door_front = 0; + // if ((data[2] >> 1 & 0x01) == 0x01) + // *door_front = 1; + + // /* 中门 */ + // if ((data[2] >> 2 & 0x01) == 0x01) + // *door_back = 0; + // if ((data[2] >> 3 & 0x01) == 0x01) + // *door_back = 1; + // break; + + //case 0x18F0BA17: + // /* 倒车 */ + // *reversing = data[7] == 0xDF ? 0 : 1; + // break; + + case 0x18F40117: /* 左转向 */ - *turn_left = (data[1] & 0x01) == 0x01 ? 0 : 1; + *turn_left = (data[1] >> 6 & 0x01) == 0x01 ? 0 : 1; /* 右转向 */ - *turn_right = (data[1] >> 1 & 0x01) == 0x01 ? 0 : 1; - + *turn_right = (data[1] >> 7 & 0x01) == 0x01 ? 0 : 1; /* 前门 */ - if ((data[2] & 0x01) == 0x01) - *door_front = 0; - if ((data[2] >> 1 & 0x01) == 0x01) - *door_front = 1; - - /* 中门 */ - if ((data[2] >> 2 & 0x01) == 0x01) - *door_back = 0; - if ((data[2] >> 3 & 0x01) == 0x01) - *door_back = 1; + *door_front = (data[0] >> 1 & 0x01) == 0x01 ? 0 : 1; + /* 后门 */ + *door_back = (data[0] & 0x01) == 0x01 ? 0 : 1; break; - - case 0x18F0BA17: + + case 0x18F101D0: /* 倒车 */ - *reversing = data[7] == 0xDF ? 0 : 1; + *reversing = data[3] & 0x07 ? 0 : 1; break; } }