更新复位源检测

Signed-off-by: lidun <1084178170@qq.com>
2024-01-09 13:54:56 +08:00 · 2024-01-09 13:54:56 +08:00 · f905e86c8e
commit f905e86c8e
parent 75633fd6ec
67 changed files with 6425 additions and 6414 deletions
--- a/OBJ/App.bin
+++ b/OBJ/App.bin
--- a/OBJ/DCBms.hex
+++ b/OBJ/DCBms.hex
--- a/OBJ/LED.axf
+++ b/OBJ/LED.axf
--- a/OBJ/LED.build_log.htm
+++ b/OBJ/LED.build_log.htm
@ -27,28 +27,28 @@ Project File Date:  01/09/2024
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'D:\keil\ARM\ARMCC\Bin'
 Rebuild target 'Target 1'
-compiling system_stm32f10x.c...
 compiling stm32f10x_it.c...
-compiling bsp_i2c_gpio.c...
-compiling spi.c...
-compiling dc300.c...
-compiling adc.c...
 compiling bsp_cpu_flash.c...
-compiling main.c...
-compiling timer.c...
 compiling chipid.c...
+compiling bsp_i2c_gpio.c...
+compiling system_stm32f10x.c...
+compiling timer.c...
 compiling common.c...
+compiling main.c...
+compiling dc300.c...
 compiling ads1015.c...
+compiling spi.c...
+compiling adc.c...
 compiling app_pwr_manage.c...
-compiling CanBusDrv.c...
-compiling can.c...
 compiling bsp_can.c...
+compiling can.c...
 assembling startup_stm32f10x_cl.s...
+compiling CanBusDrv.c...
 compiling porting.c...
+compiling led.c...
+compiling delay.c...
 compiling can_app.c...
 compiling CanDrvCtrl.c...
-compiling delay.c...
-compiling led.c...
 compiling sys.c...
 compiling core_cm3.c...
 compiling usart.c...
@ -57,30 +57,30 @@ compiling stm32f10x_gpio.c...
 compiling stm32f10x_usart.c...
 compiling stm32f10x_rcc.c...
 compiling stm32f10x_can.c...
-compiling stm32f10x_tim.c...
-compiling stm32f10x_adc.c...
 compiling stm32f10x_dma.c...
-compiling stm32f10x_flash.c...
+compiling stm32f10x_adc.c...
 compiling stm32f10x_iwdg.c...
+compiling stm32f10x_tim.c...
+compiling stm32f10x_flash.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 stm32f10x_wwdg.c...
+compiling CDZ_DATA.c...
 compiling Err_code.c...
+compiling stm32f10x_exti.c...
 compiling REV_CarMessage.c...
 compiling SEN_DCUMessage.c...
+compiling CDZ_State.c...
 compiling Single_event_receiver.c...
 compiling Err_Info_Process.c...
-compiling CDZ_State.c...
 compiling mm.c...
 compiling KC.c...
 compiling Sleep.c...
 compiling SecTimer.c...
 linking...
-Program Size: Code=49520 RO-data=3028 RW-data=2972 ZI-data=22764  
+Program Size: Code=49776 RO-data=3028 RW-data=2972 ZI-data=22764  
 FromELF: creating hex file...
 After Build - User command #1: ..\OBJ\merge.cmd
 D:\git_lidun\42_SaLiSi\1-08\CELIS\USER>set "cmdDir=D:\git_lidun\42_SaLiSi\1-08\CELIS\OBJ\" 
@ -111,7 +111,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
@ -1,5 +1,5 @@
 Dependencies for Project 'LED', Target 'Target 1': (DO NOT MODIFY !)
-F (.\main.c)(0x659C25CE)(--c99 --gnu -c --cpu Cortex-M3 -D__MICROLIB -g -W -O0 --apcs=interwork --split_sections -I ..\HARDWARE\LED -I ..\SYSTEM\delay -I ..\SYSTEM\sys -I ..\SYSTEM\usart -I ..\USER -I ..\STM32F10x_FWLib\inc -I ..\CORE -I ..\HARDWARE\CAN -I ..\HARDWARE\TIMER -I ..\HARDWARE -I ..\SYSTEM -I ..\SYSTEM\FATFS -I ..\SYSTEM\FATFS\src\option -I ..\SYSTEM\FATFS\src -I ..\HARDWARE\LOWPOWER -I ..\HARDWARE\CDZ -I ..\HARDWARE\CELIS -I ..\HARDWARE\DEV_HAL -I ..\APPLICATION\CDZ -I ..\APPLICATION\Errcode -I ..\APPLICATION\External -I ..\APPLICATION\Sleep -I ..\HARDWARE\EVENT -I ..\APPLICATION\MM -I ..\APPLICATION\SecTimer --diag_suppress=236 --diag_suppress=177

-I.\RTE\_Target_1

-ID:\keil\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include

-ID:\keil\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include

-D__UVISION_VERSION="525" -D_RTE_ -DSTM32F10X_CL -DUSE_STDPERIPH_DRIVER -DSTM32F10X_CL -DUSE_STM3210C_EVAL

-o ..\obj\main.o --omf_browse ..\obj\main.crf --depend ..\obj\main.d)
+F (.\main.c)(0x659CD9E2)(--c99 --gnu -c --cpu Cortex-M3 -D__MICROLIB -g -W -O0 --apcs=interwork --split_sections -I ..\HARDWARE\LED -I ..\SYSTEM\delay -I ..\SYSTEM\sys -I ..\SYSTEM\usart -I ..\USER -I ..\STM32F10x_FWLib\inc -I ..\CORE -I ..\HARDWARE\CAN -I ..\HARDWARE\TIMER -I ..\HARDWARE -I ..\SYSTEM -I ..\SYSTEM\FATFS -I ..\SYSTEM\FATFS\src\option -I ..\SYSTEM\FATFS\src -I ..\HARDWARE\LOWPOWER -I ..\HARDWARE\CDZ -I ..\HARDWARE\CELIS -I ..\HARDWARE\DEV_HAL -I ..\APPLICATION\CDZ -I ..\APPLICATION\Errcode -I ..\APPLICATION\External -I ..\APPLICATION\Sleep -I ..\HARDWARE\EVENT -I ..\APPLICATION\MM -I ..\APPLICATION\SecTimer --diag_suppress=236 --diag_suppress=177

-I.\RTE\_Target_1

-ID:\keil\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include

-ID:\keil\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include

-D__UVISION_VERSION="525" -D_RTE_ -DSTM32F10X_CL -DUSE_STDPERIPH_DRIVER -DSTM32F10X_CL -DUSE_STM3210C_EVAL

-o ..\obj\main.o --omf_browse ..\obj\main.crf --depend ..\obj\main.d)
 I (D:\keil\ARM\ARMCC\include\stdbool.h)(0x64463312)
 I (..\SYSTEM\chipid.h)(0x659BCA4B)
 I (..\USER\stm32f10x.h)(0x659BCA4B)
@ -426,7 +426,7 @@ I (..\STM32F10x_FWLib\inc\stm32f10x_tim.h)(0x659BCA4B)
 I (..\STM32F10x_FWLib\inc\stm32f10x_usart.h)(0x659BCA4B)
 I (..\STM32F10x_FWLib\inc\misc.h)(0x659BCA4B)
 I (..\SYSTEM\dc300.h)(0x659BCA4B)
-F (..\SYSTEM\usart\usart.c)(0x659BCA4B)(--c99 --gnu -c --cpu Cortex-M3 -D__MICROLIB -g -W -O0 --apcs=interwork --split_sections -I ..\HARDWARE\LED -I ..\SYSTEM\delay -I ..\SYSTEM\sys -I ..\SYSTEM\usart -I ..\USER -I ..\STM32F10x_FWLib\inc -I ..\CORE -I ..\HARDWARE\CAN -I ..\HARDWARE\TIMER -I ..\HARDWARE -I ..\SYSTEM -I ..\SYSTEM\FATFS -I ..\SYSTEM\FATFS\src\option -I ..\SYSTEM\FATFS\src -I ..\HARDWARE\LOWPOWER -I ..\HARDWARE\CDZ -I ..\HARDWARE\CELIS -I ..\HARDWARE\DEV_HAL -I ..\APPLICATION\CDZ -I ..\APPLICATION\Errcode -I ..\APPLICATION\External -I ..\APPLICATION\Sleep -I ..\HARDWARE\EVENT -I ..\APPLICATION\MM -I ..\APPLICATION\SecTimer --diag_suppress=236 --diag_suppress=177

-I.\RTE\_Target_1

-ID:\keil\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include

-ID:\keil\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include

-D__UVISION_VERSION="525" -D_RTE_ -DSTM32F10X_CL -DUSE_STDPERIPH_DRIVER -DSTM32F10X_CL -DUSE_STM3210C_EVAL

-o ..\obj\usart.o --omf_browse ..\obj\usart.crf --depend ..\obj\usart.d)
+F (..\SYSTEM\usart\usart.c)(0x659CBE86)(--c99 --gnu -c --cpu Cortex-M3 -D__MICROLIB -g -W -O0 --apcs=interwork --split_sections -I ..\HARDWARE\LED -I ..\SYSTEM\delay -I ..\SYSTEM\sys -I ..\SYSTEM\usart -I ..\USER -I ..\STM32F10x_FWLib\inc -I ..\CORE -I ..\HARDWARE\CAN -I ..\HARDWARE\TIMER -I ..\HARDWARE -I ..\SYSTEM -I ..\SYSTEM\FATFS -I ..\SYSTEM\FATFS\src\option -I ..\SYSTEM\FATFS\src -I ..\HARDWARE\LOWPOWER -I ..\HARDWARE\CDZ -I ..\HARDWARE\CELIS -I ..\HARDWARE\DEV_HAL -I ..\APPLICATION\CDZ -I ..\APPLICATION\Errcode -I ..\APPLICATION\External -I ..\APPLICATION\Sleep -I ..\HARDWARE\EVENT -I ..\APPLICATION\MM -I ..\APPLICATION\SecTimer --diag_suppress=236 --diag_suppress=177

-I.\RTE\_Target_1

-ID:\keil\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include

-ID:\keil\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include

-D__UVISION_VERSION="525" -D_RTE_ -DSTM32F10X_CL -DUSE_STDPERIPH_DRIVER -DSTM32F10X_CL -DUSE_STM3210C_EVAL

-o ..\obj\usart.o --omf_browse ..\obj\usart.crf --depend ..\obj\usart.d)
 I (..\SYSTEM\sys\sys.h)(0x659BCA4B)
 I (..\USER\stm32f10x.h)(0x659BCA4B)
 I (..\CORE\core_cm3.h)(0x659BCA4B)
@ -450,6 +450,10 @@ I (..\SYSTEM\adc.h)(0x659C257B)
 I (D:\keil\ARM\ARMCC\include\stdbool.h)(0x64463312)
 I (..\SYSTEM\dc300.h)(0x659BCA4B)
 I (..\SYSTEM\sd.h)(0x659BCA4B)
+I (..\HARDWARE\DEV_HAL\KC.h)(0x659BCA4B)
+I (..\STM32F10x_FWLib\inc\stm32f10x_iwdg.h)(0x659BCA4B)
+I (..\HARDWARE\DEV_HAL\de_dev.h)(0x659BCA4B)
+I (..\HARDWARE\DEV_HAL\de_demo.h)(0x659BCA4B)
 F (..\CORE\core_cm3.c)(0x659BCA4B)(--c99 --gnu -c --cpu Cortex-M3 -D__MICROLIB -g -W -O0 --apcs=interwork --split_sections -I ..\HARDWARE\LED -I ..\SYSTEM\delay -I ..\SYSTEM\sys -I ..\SYSTEM\usart -I ..\USER -I ..\STM32F10x_FWLib\inc -I ..\CORE -I ..\HARDWARE\CAN -I ..\HARDWARE\TIMER -I ..\HARDWARE -I ..\SYSTEM -I ..\SYSTEM\FATFS -I ..\SYSTEM\FATFS\src\option -I ..\SYSTEM\FATFS\src -I ..\HARDWARE\LOWPOWER -I ..\HARDWARE\CDZ -I ..\HARDWARE\CELIS -I ..\HARDWARE\DEV_HAL -I ..\APPLICATION\CDZ -I ..\APPLICATION\Errcode -I ..\APPLICATION\External -I ..\APPLICATION\Sleep -I ..\HARDWARE\EVENT -I ..\APPLICATION\MM -I ..\APPLICATION\SecTimer --diag_suppress=236 --diag_suppress=177

-I.\RTE\_Target_1

-ID:\keil\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include

-ID:\keil\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include

-D__UVISION_VERSION="525" -D_RTE_ -DSTM32F10X_CL -DUSE_STDPERIPH_DRIVER -DSTM32F10X_CL -DUSE_STM3210C_EVAL

-o ..\obj\core_cm3.o --omf_browse ..\obj\core_cm3.crf --depend ..\obj\core_cm3.d)
 I (D:\keil\ARM\ARMCC\include\stdint.h)(0x648EEA36)
 F (..\CORE\startup_stm32f10x_cl.s)(0x659BCA4B)(--cpu Cortex-M3 -g --apcs=interwork --pd "__MICROLIB SETA 1"

-I.\RTE\_Target_1

-ID:\keil\ARM\PACK\ARM\CMSIS\5.3.0\CMSIS\Include

-ID:\keil\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include

--pd "__UVISION_VERSION SETA 525" --pd "_RTE_ SETA 1" --pd "STM32F10X_CL SETA 1"

--list .\startup_stm32f10x_cl.lst --xref -o ..\obj\startup_stm32f10x_cl.o --depend ..\obj\startup_stm32f10x_cl.d)
--- a/OBJ/adc.o
+++ b/OBJ/adc.o
--- a/OBJ/ads1015.o
+++ b/OBJ/ads1015.o
--- a/OBJ/app_pwr_manage.o
+++ b/OBJ/app_pwr_manage.o
--- a/OBJ/bsp_can.o
+++ b/OBJ/bsp_can.o
--- a/OBJ/bsp_cpu_flash.o
+++ b/OBJ/bsp_cpu_flash.o
--- a/OBJ/bsp_i2c_gpio.o
+++ b/OBJ/bsp_i2c_gpio.o
--- a/OBJ/can.o
+++ b/OBJ/can.o
--- a/OBJ/can_app.o
+++ b/OBJ/can_app.o
--- a/OBJ/canbusdrv.o
+++ b/OBJ/canbusdrv.o
--- a/OBJ/candrvctrl.o
+++ b/OBJ/candrvctrl.o
--- a/OBJ/cdz_data.o
+++ b/OBJ/cdz_data.o
--- a/OBJ/cdz_state.o
+++ b/OBJ/cdz_state.o
--- a/OBJ/chipid.o
+++ b/OBJ/chipid.o
--- a/OBJ/common.o
+++ b/OBJ/common.o
--- a/OBJ/core_cm3.o
+++ b/OBJ/core_cm3.o
--- a/OBJ/dc300.o
+++ b/OBJ/dc300.o
--- a/OBJ/delay.o
+++ b/OBJ/delay.o
--- a/OBJ/err_code.o
+++ b/OBJ/err_code.o
--- a/OBJ/err_info_process.o
+++ b/OBJ/err_info_process.o
--- a/OBJ/kc.o
+++ b/OBJ/kc.o
--- 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.o
+++ b/OBJ/misc.o
--- a/OBJ/mm.o
+++ b/OBJ/mm.o
--- a/OBJ/porting.o
+++ b/OBJ/porting.o
--- a/OBJ/rev_carmessage.o
+++ b/OBJ/rev_carmessage.o
--- a/OBJ/sectimer.o
+++ b/OBJ/sectimer.o
--- a/OBJ/sen_dcumessage.o
+++ b/OBJ/sen_dcumessage.o
--- a/OBJ/single_event_receiver.o
+++ b/OBJ/single_event_receiver.o
--- a/OBJ/sleep.o
+++ b/OBJ/sleep.o
--- a/OBJ/spi.o
+++ b/OBJ/spi.o
--- a/OBJ/stm32f10x_adc.o
+++ b/OBJ/stm32f10x_adc.o
--- a/OBJ/stm32f10x_bkp.o
+++ b/OBJ/stm32f10x_bkp.o
--- a/OBJ/stm32f10x_can.o
+++ b/OBJ/stm32f10x_can.o
--- a/OBJ/stm32f10x_dma.o
+++ b/OBJ/stm32f10x_dma.o
--- a/OBJ/stm32f10x_exti.o
+++ b/OBJ/stm32f10x_exti.o
--- a/OBJ/stm32f10x_flash.o
+++ b/OBJ/stm32f10x_flash.o
--- a/OBJ/stm32f10x_gpio.o
+++ b/OBJ/stm32f10x_gpio.o
--- a/OBJ/stm32f10x_it.o
+++ b/OBJ/stm32f10x_it.o
--- a/OBJ/stm32f10x_iwdg.o
+++ b/OBJ/stm32f10x_iwdg.o
--- a/OBJ/stm32f10x_pwr.o
+++ b/OBJ/stm32f10x_pwr.o
--- a/OBJ/stm32f10x_rcc.o
+++ b/OBJ/stm32f10x_rcc.o
--- a/OBJ/stm32f10x_rtc.o
+++ b/OBJ/stm32f10x_rtc.o
--- a/OBJ/stm32f10x_spi.o
+++ b/OBJ/stm32f10x_spi.o
--- a/OBJ/stm32f10x_tim.o
+++ b/OBJ/stm32f10x_tim.o
--- a/OBJ/stm32f10x_usart.o
+++ b/OBJ/stm32f10x_usart.o
--- a/OBJ/stm32f10x_wwdg.o
+++ b/OBJ/stm32f10x_wwdg.o
--- a/OBJ/sys.o
+++ b/OBJ/sys.o
--- a/OBJ/system_stm32f10x.o
+++ b/OBJ/system_stm32f10x.o
--- a/OBJ/timer.o
+++ b/OBJ/timer.o
--- a/OBJ/usart.crf
+++ b/OBJ/usart.crf
--- a/OBJ/usart.d
+++ b/OBJ/usart.d
@ -23,3 +23,8 @@
 ..\obj\usart.o: D:\keil\ARM\ARMCC\Bin\..\include\stdbool.h
 ..\obj\usart.o: ..\SYSTEM\dc300.h
 ..\obj\usart.o: ..\SYSTEM\sd.h
+..\obj\usart.o: ..\HARDWARE\DEV_HAL\KC.h
+..\obj\usart.o: ..\HARDWARE\DEV_HAL\KC.h
+..\obj\usart.o: ..\STM32F10x_FWLib\inc\stm32f10x_iwdg.h
+..\obj\usart.o: ..\HARDWARE\DEV_HAL\de_dev.h
+..\obj\usart.o: ..\HARDWARE\DEV_HAL\de_demo.h
--- a/OBJ/usart.o
+++ b/OBJ/usart.o
--- a/SYSTEM/usart/usart.c
+++ b/SYSTEM/usart/usart.c
--- a/USER/JLinkLog.txt
+++ b/USER/JLinkLog.txt
--- a/USER/LED.map
+++ b/USER/LED.map
--- a/USER/LED.uvguix.14617
+++ b/USER/LED.uvguix.14617
--- a/USER/LED.uvoptx
+++ b/USER/LED.uvoptx
@ -1178,7 +1178,7 @@

  <Group>
    <GroupName>KC</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
    <tvExpOptDlg>0</tvExpOptDlg>
    <cbSel>0</cbSel>
    <RteFlg>0</RteFlg>
@ -1250,7 +1250,7 @@

  <Group>
    <GroupName>SecTimer</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
    <tvExpOptDlg>0</tvExpOptDlg>
    <cbSel>0</cbSel>
    <RteFlg>0</RteFlg>
--- a/USER/main.c
+++ b/USER/main.c