修复插转接头后插交流枪识别为直流枪

Signed-off-by: lidun <1084178170@qq.com>
2024-01-13 12:53:47 +08:00 · 2024-01-13 12:53:47 +08:00 · c9860f3e9e
commit c9860f3e9e
parent 1b6941037a
120 changed files with 7051 additions and 7149 deletions
--- a/APPLICATION/GUNDiscriminate/GUNDiscriminate.c
+++ b/APPLICATION/GUNDiscriminate/GUNDiscriminate.c
--- a/HARDWARE/CDZ/CDZ_State.c
+++ b/HARDWARE/CDZ/CDZ_State.c
--- a/OBJ/App.bin
+++ b/OBJ/App.bin
--- a/OBJ/DCBms.hex
+++ b/OBJ/DCBms.hex
--- a/OBJ/ExtDll.iex
+++ b/OBJ/ExtDll.iex
@ -0,0 +1,2 @@
+[EXTDLL]
+Count=0
--- a/OBJ/LED.axf
+++ b/OBJ/LED.axf
--- a/OBJ/LED.build_log.htm
+++ b/OBJ/LED.build_log.htm
@ -21,54 +21,54 @@ Target DLL:      Segger\JL2CM3.dll V2.99.29.0
 Dialog DLL:      TCM.DLL V1.35.1.0
 
 <h2>Project:</h2>
-D:\git_lidun\42_SaLiSi\1-12\CELIS\USER\LED.uvprojx
-Project File Date:  01/12/2024
+D:\git_lidun\42_SaLiSi\1-13\CELIS\USER\LED.uvprojx
+Project File Date:  01/13/2024

 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\keil\ARM\ARMCC\Bin'
 Rebuild target 'Target 1'
-compiling spi.c...
+compiling stm32f10x_it.c...
 compiling timer.c...
 compiling bsp_i2c_gpio.c...
-compiling dc300.c...
-compiling system_stm32f10x.c...
-compiling bsp_cpu_flash.c...
-compiling common.c...
-compiling chipid.c...
-compiling stm32f10x_it.c...
 compiling adc.c...
-compiling ads1015.c...
+compiling spi.c...
+compiling dc300.c...
 compiling main.c...
+compiling bsp_cpu_flash.c...
+compiling chipid.c...
+compiling system_stm32f10x.c...
+compiling common.c...
+compiling ads1015.c...
 compiling app_pwr_manage.c...
 compiling can.c...
 assembling startup_stm32f10x_cl.s...
 compiling CanBusDrv.c...
 compiling bsp_can.c...
 compiling porting.c...
-compiling delay.c...
-compiling can_app.c...
 compiling CanDrvCtrl.c...
+compiling delay.c...
 compiling led.c...
+compiling can_app.c...
 compiling sys.c...
 compiling core_cm3.c...
 compiling misc.c...
 compiling usart.c...
 compiling stm32f10x_gpio.c...
-compiling stm32f10x_rcc.c...
 compiling stm32f10x_usart.c...
-compiling stm32f10x_tim.c...
+compiling stm32f10x_rcc.c...
 compiling stm32f10x_can.c...
+compiling stm32f10x_adc.c...
 compiling stm32f10x_dma.c...
 compiling stm32f10x_iwdg.c...
-compiling stm32f10x_adc.c...
 compiling stm32f10x_flash.c...
+compiling stm32f10x_tim.c...
 compiling stm32f10x_spi.c...
 compiling stm32f10x_bkp.c...
 compiling stm32f10x_pwr.c...
 compiling stm32f10x_rtc.c...
 compiling stm32f10x_exti.c...
-compiling CDZ_DATA.c...
 compiling Err_code.c...
+compiling CDZ_DATA.c...
 compiling stm32f10x_wwdg.c...
 compiling REV_CarMessage.c...
 compiling Single_event_receiver.c...
@ -76,18 +76,18 @@ compiling SEN_DCUMessage.c...
 compiling mm.c...
 compiling Err_Info_Process.c...
 compiling CDZ_State.c...
-compiling Sleep.c...
 compiling KC.c...
+compiling Sleep.c...
 compiling SecTimer.c...
 compiling GUNDiscriminate.c...
 linking...
-Program Size: Code=50684 RO-data=3036 RW-data=2996 ZI-data=22764  
+Program Size: Code=49960 RO-data=2760 RW-data=2916 ZI-data=22764  
 FromELF: creating hex file...
 After Build - User command #1: ..\OBJ\merge.cmd
-D:\git_lidun\42_SaLiSi\1-12\CELIS\USER>set "cmdDir=D:\git_lidun\42_SaLiSi\1-12\CELIS\OBJ\" 
-D:\git_lidun\42_SaLiSi\1-12\CELIS\USER>copy D:\git_lidun\42_SaLiSi\1-12\CELIS\OBJ\boot.hex D:\git_lidun\42_SaLiSi\1-12\CELIS\OBJ\DCBms.hex 
+D:\git_lidun\42_SaLiSi\1-13\CELIS\USER>set "cmdDir=D:\git_lidun\42_SaLiSi\1-13\CELIS\OBJ\" 
+D:\git_lidun\42_SaLiSi\1-13\CELIS\USER>copy D:\git_lidun\42_SaLiSi\1-13\CELIS\OBJ\boot.hex D:\git_lidun\42_SaLiSi\1-13\CELIS\OBJ\DCBms.hex 
 ÒÑ¸´ÖÆ         1 ¸öÎÄ¼þ¡£
-D:\git_lidun\42_SaLiSi\1-12\CELIS\USER>type D:\git_lidun\42_SaLiSi\1-12\CELIS\OBJ\LED.hex  1>>D:\git_lidun\42_SaLiSi\1-12\CELIS\OBJ\DCBms.hex 
+D:\git_lidun\42_SaLiSi\1-13\CELIS\USER>type D:\git_lidun\42_SaLiSi\1-13\CELIS\OBJ\LED.hex  1>>D:\git_lidun\42_SaLiSi\1-13\CELIS\OBJ\DCBms.hex 
 After Build - User command #2: fromelf --bin --output ..\OBJ\App.bin ..\OBJ\LED.axf
 "..\OBJ\LED.axf" - 0 Error(s), 0 Warning(s).

@ -112,7 +112,7 @@ Package Vendor: Keil
 <h2>Collection of Component Files used:</h2>

   * Component: ARM::CMSIS:CORE:5.1.1
-Build Time Elapsed:  00:00:05
+Build Time Elapsed:  00:00:04
 </pre>
 </body>
 </html>
--- a/OBJ/LED.hex
+++ b/OBJ/LED.hex
--- a/OBJ/LED.htm
+++ b/OBJ/LED.htm
--- a/OBJ/LED_Target
+++ b/OBJ/LED_Target
--- a/OBJ/adc.crf
+++ b/OBJ/adc.crf
--- a/OBJ/adc.o
+++ b/OBJ/adc.o
--- a/OBJ/ads1015.crf
+++ b/OBJ/ads1015.crf
--- a/OBJ/ads1015.o
+++ b/OBJ/ads1015.o
--- a/OBJ/app_pwr_manage.crf
+++ b/OBJ/app_pwr_manage.crf
--- a/OBJ/app_pwr_manage.o
+++ b/OBJ/app_pwr_manage.o
--- a/OBJ/bsp_can.crf
+++ b/OBJ/bsp_can.crf
--- a/OBJ/bsp_can.o
+++ b/OBJ/bsp_can.o
--- a/OBJ/bsp_cpu_flash.crf
+++ b/OBJ/bsp_cpu_flash.crf
--- a/OBJ/bsp_cpu_flash.o
+++ b/OBJ/bsp_cpu_flash.o
--- a/OBJ/bsp_i2c_gpio.crf
+++ b/OBJ/bsp_i2c_gpio.crf
--- a/OBJ/bsp_i2c_gpio.o
+++ b/OBJ/bsp_i2c_gpio.o
--- a/OBJ/can.crf
+++ b/OBJ/can.crf
--- a/OBJ/can.o
+++ b/OBJ/can.o
--- a/OBJ/can_app.crf
+++ b/OBJ/can_app.crf
--- a/OBJ/can_app.o
+++ b/OBJ/can_app.o
--- a/OBJ/canbusdrv.crf
+++ b/OBJ/canbusdrv.crf
--- a/OBJ/canbusdrv.o
+++ b/OBJ/canbusdrv.o
--- a/OBJ/candrvctrl.crf
+++ b/OBJ/candrvctrl.crf
--- a/OBJ/candrvctrl.o
+++ b/OBJ/candrvctrl.o
--- a/OBJ/cdz_data.crf
+++ b/OBJ/cdz_data.crf
--- a/OBJ/cdz_data.o
+++ b/OBJ/cdz_data.o
--- a/OBJ/cdz_state.crf
+++ b/OBJ/cdz_state.crf
--- a/OBJ/cdz_state.o
+++ b/OBJ/cdz_state.o
--- a/OBJ/chipid.crf
+++ b/OBJ/chipid.crf
--- a/OBJ/chipid.o
+++ b/OBJ/chipid.o
--- a/OBJ/common.crf
+++ b/OBJ/common.crf
--- a/OBJ/common.o
+++ b/OBJ/common.o
--- a/OBJ/core_cm3.crf
+++ b/OBJ/core_cm3.crf
--- a/OBJ/core_cm3.o
+++ b/OBJ/core_cm3.o
--- a/OBJ/dc300.crf
+++ b/OBJ/dc300.crf
--- a/OBJ/dc300.o
+++ b/OBJ/dc300.o
--- a/OBJ/delay.crf
+++ b/OBJ/delay.crf
--- a/OBJ/delay.o
+++ b/OBJ/delay.o
--- a/OBJ/err_code.crf
+++ b/OBJ/err_code.crf
--- a/OBJ/err_code.o
+++ b/OBJ/err_code.o
--- a/OBJ/err_info_process.crf
+++ b/OBJ/err_info_process.crf
--- a/OBJ/err_info_process.o
+++ b/OBJ/err_info_process.o
--- a/OBJ/gundiscriminate.crf
+++ b/OBJ/gundiscriminate.crf
--- a/OBJ/gundiscriminate.o
+++ b/OBJ/gundiscriminate.o
--- a/OBJ/kc.crf
+++ b/OBJ/kc.crf
--- a/OBJ/kc.o
+++ b/OBJ/kc.o
--- a/OBJ/led.crf
+++ b/OBJ/led.crf
--- a/OBJ/led.o
+++ b/OBJ/led.o
--- a/OBJ/main.crf
+++ b/OBJ/main.crf
--- a/OBJ/main.o
+++ b/OBJ/main.o
--- a/OBJ/misc.crf
+++ b/OBJ/misc.crf
--- a/OBJ/misc.o
+++ b/OBJ/misc.o
--- a/OBJ/mm.crf
+++ b/OBJ/mm.crf
--- a/OBJ/mm.o
+++ b/OBJ/mm.o
--- a/OBJ/porting.crf
+++ b/OBJ/porting.crf
--- a/OBJ/porting.o
+++ b/OBJ/porting.o
--- a/OBJ/rev_carmessage.crf
+++ b/OBJ/rev_carmessage.crf
--- a/OBJ/rev_carmessage.o
+++ b/OBJ/rev_carmessage.o
--- a/OBJ/sectimer.crf
+++ b/OBJ/sectimer.crf
--- a/OBJ/sectimer.o
+++ b/OBJ/sectimer.o
--- a/OBJ/sen_dcumessage.crf
+++ b/OBJ/sen_dcumessage.crf
--- a/OBJ/sen_dcumessage.o
+++ b/OBJ/sen_dcumessage.o
--- a/OBJ/single_event_receiver.crf
+++ b/OBJ/single_event_receiver.crf
--- a/OBJ/single_event_receiver.o
+++ b/OBJ/single_event_receiver.o
--- a/OBJ/sleep.crf
+++ b/OBJ/sleep.crf
--- a/OBJ/sleep.o
+++ b/OBJ/sleep.o
--- a/OBJ/spi.crf
+++ b/OBJ/spi.crf
--- a/OBJ/spi.o
+++ b/OBJ/spi.o
--- a/OBJ/startup_stm32f10x_cl.o
+++ b/OBJ/startup_stm32f10x_cl.o
--- a/OBJ/stm32f10x_adc.crf
+++ b/OBJ/stm32f10x_adc.crf
--- a/OBJ/stm32f10x_adc.o
+++ b/OBJ/stm32f10x_adc.o
--- a/OBJ/stm32f10x_bkp.crf
+++ b/OBJ/stm32f10x_bkp.crf
--- a/OBJ/stm32f10x_bkp.o
+++ b/OBJ/stm32f10x_bkp.o
--- a/OBJ/stm32f10x_can.crf
+++ b/OBJ/stm32f10x_can.crf
--- a/OBJ/stm32f10x_can.o
+++ b/OBJ/stm32f10x_can.o
--- a/OBJ/stm32f10x_dma.crf
+++ b/OBJ/stm32f10x_dma.crf
--- a/OBJ/stm32f10x_dma.o
+++ b/OBJ/stm32f10x_dma.o
--- a/OBJ/stm32f10x_exti.crf
+++ b/OBJ/stm32f10x_exti.crf
--- a/OBJ/stm32f10x_exti.o
+++ b/OBJ/stm32f10x_exti.o
--- a/OBJ/stm32f10x_flash.crf
+++ b/OBJ/stm32f10x_flash.crf
--- a/OBJ/stm32f10x_flash.o
+++ b/OBJ/stm32f10x_flash.o
--- a/OBJ/stm32f10x_gpio.crf
+++ b/OBJ/stm32f10x_gpio.crf
--- a/OBJ/stm32f10x_gpio.o
+++ b/OBJ/stm32f10x_gpio.o
--- a/OBJ/stm32f10x_it.crf
+++ b/OBJ/stm32f10x_it.crf
--- a/OBJ/stm32f10x_it.o
+++ b/OBJ/stm32f10x_it.o
--- a/OBJ/stm32f10x_iwdg.crf
+++ b/OBJ/stm32f10x_iwdg.crf
--- a/OBJ/stm32f10x_iwdg.o
+++ b/OBJ/stm32f10x_iwdg.o
--- a/OBJ/stm32f10x_pwr.crf
+++ b/OBJ/stm32f10x_pwr.crf
--- a/OBJ/stm32f10x_pwr.o
+++ b/OBJ/stm32f10x_pwr.o
--- a/OBJ/stm32f10x_rcc.crf
+++ b/OBJ/stm32f10x_rcc.crf
--- a/OBJ/stm32f10x_rcc.o
+++ b/OBJ/stm32f10x_rcc.o
--- a/OBJ/stm32f10x_rtc.crf
+++ b/OBJ/stm32f10x_rtc.crf
--- a/OBJ/stm32f10x_rtc.o
+++ b/OBJ/stm32f10x_rtc.o
--- a/OBJ/stm32f10x_spi.crf
+++ b/OBJ/stm32f10x_spi.crf
--- a/Show More
+++ b/Show More