diff --git a/.gitignore b/.gitignore index 59e7c65..900714c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ python/dist/ *.xlsx *.json quest_info.txt -*.jwt \ No newline at end of file +*.jwt +bootcode.txt diff --git a/checher_slave.uvoptx b/checher_slave.uvoptx index 70f6442..d03c784 100644 --- a/checher_slave.uvoptx +++ b/checher_slave.uvoptx @@ -21,6 +21,230 @@ 0 + + boot + 0x4 + ARM-ADS + + 12000000 + + 1 + 1 + 0 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + .\Listings\ + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 0 + + 18 + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 6 + + + + + + + + + + + STLink\ST-LINKIII-KEIL_SWO.dll + + + + 0 + DLGUARM + (105=-1,-1,-1,-1,0) + + + 0 + ST-LINKIII-KEIL_SWO + -U52FF6E065266545441081687 -O206 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM) + + + 0 + UL2CM3 + UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0GD32F30x_HD -FL040000 -FS08000000 -FP0($$Device:GD32F303RC$Flash\GD32F30x_HD.FLM) + + + 0 + JL2CM3 + -U69655983 -O78 -S5 -ZTIFSpeedSel1000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM) + + + 0 + ARMRTXEVENTFLAGS + -L70 -Z18 -C0 -M0 -T1 + + + 0 + DLGTARM + (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0) + + + 0 + ARMDBGFLAGS + + + + + + + 0 + 1 + m_used + + + + + 1 + 0 + 0x08004000 + 0 + + + + + 2 + 1 + m + 0 + + + + + 3 + 1 + 0x2000CA00 + 0 + + + + + 4 + 0 + 0x20019bb0 + 0 + + + + 0 + + + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + 1 + 1 + 0 + 2 + 10000000 + + + + app 0x4 @@ -246,7 +470,7 @@ - boot + app_debug 0x4 ARM-ADS @@ -341,11 +565,6 @@ STLink\ST-LINKIII-KEIL_SWO.dll - - 0 - DLGUARM - (105=-1,-1,-1,-1,0) - 0 ST-LINKIII-KEIL_SWO @@ -354,13 +573,18 @@ 0 UL2CM3 - UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0GD32F30x_HD -FL040000 -FS08000000 -FP0($$Device:GD32F303RC$Flash\GD32F30x_HD.FLM) + UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F10x_512 -FL080000 -FS08000000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM) 0 JL2CM3 -U69655983 -O78 -S5 -ZTIFSpeedSel1000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM) + + 0 + DLGUARM + (105=-1,-1,-1,-1,0) + 0 ARMRTXEVENTFLAGS @@ -369,7 +593,7 @@ 0 DLGTARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0) + (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=1165,218,1505,941,0) 0 @@ -382,22 +606,22 @@ 0 1 - m_used + g_tempptr 1 - 0 - 0x08004000 + 8 + 0x0801d000 0 2 - 1 - m + 0 + 0x0803B000 0 @@ -943,7 +1167,7 @@ elec_det - 1 + 0 0 0 0 @@ -1271,7 +1495,7 @@ rt_thread - 0 + 1 0 0 0 @@ -1507,7 +1731,7 @@ soft - 1 + 0 0 0 0 @@ -1602,18 +1826,6 @@ 0 0 0 - .\source\soft\cJSON.c - cJSON.c - 0 - 0 - - - 9 - 90 - 1 - 0 - 0 - 0 .\source\soft\debug.c debug.c 0 @@ -1621,7 +1833,7 @@ 9 - 91 + 90 1 0 0 @@ -1633,7 +1845,7 @@ 9 - 92 + 91 1 0 0 @@ -1643,11 +1855,23 @@ 0 0 + + 9 + 92 + 1 + 0 + 0 + 0 + .\source\soft\cJSON.c + cJSON.c + 0 + 0 + task - 1 + 0 0 0 0 @@ -1715,7 +1939,7 @@ codec - 1 + 0 0 0 0 diff --git a/checher_slave.uvprojx b/checher_slave.uvprojx index 36dac77..ccad291 100644 --- a/checher_slave.uvprojx +++ b/checher_slave.uvprojx @@ -6,1297 +6,11 @@
### uVision Project, (C) Keil Software
- - app - 0x4 - ARM-ADS - 5060750::V5.06 update 6 (build 750)::ARMCC - 0 - - - STM32F103RC - STMicroelectronics - Keil.STM32F1xx_DFP.2.1.0 - http://www.keil.com/pack/ - IRAM(0x20000000,0xC000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE - - - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)) - 0 - $$Device:STM32F103RC$Device\Include\stm32f10x.h - - - - - - - - - - $$Device:STM32F103RC$SVD\STM32F103xx.svd - 0 - 0 - - - - - - - 0 - 0 - 0 - 0 - 1 - - .\Objects\app\ - checker_slave_app - 1 - 0 - 1 - 1 - 1 - .\Listings\ - 1 - 0 - 0 - - 0 - 0 - - - 0 - 0 - 0 - 0 - - - 1 - 0 - python source\prebuild.py - - 0 - 0 - 0 - 0 - - - 1 - 1 - fromelf.exe --bin -o "$L@L.bin" "#L" - python source\mycopy.py - 0 - 0 - 0 - 0 - - 0 - - - - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 3 - - - 1 - - - SARMCM3.DLL - -REMAP - DCM.DLL - -pCM3 - SARMCM3.DLL - - TCM.DLL - -pCM3 - - - - 1 - 0 - 0 - 0 - 16 - - - - - 1 - 0 - 0 - 0 - 1 - 4096 - - 1 - BIN\UL2CM3.DLL - "" () - - - - - 0 - - - - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - "Cortex-M3" - - 0 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 8 - 0 - 0 - 0 - 0 - 3 - 3 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 1 - 0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x20000000 - 0xc000 - - - 1 - 0x8000000 - 0x40000 - - - 0 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x8004000 - 0x40000 - - - 1 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x20000020 - 0xc000 - - - 0 - 0x0 - 0x0 - - - - - - 1 - 1 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 2 - 0 - 0 - 1 - 1 - 0 - 3 - 3 - 1 - 1 - 0 - 0 - 0 - - --diag_suppress=550,177 --locale=english - STM32F10X_HD,USE_STDPERIPH_DRIVER,RT_THREAD - - .\source\interface;.\source\core;.\source\stm32lib\inc;.\source\main;.\source\RTT;.\source\rt_thread\include;.\source\rt_thread;.\source\soft;.\source\task;.\source\dev;.\source\codec;.\source\coder;.\source\elec_det - - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - - - - 1 - 0 - 0 - 0 - 1 - 0 - 0x08000000 - 0x20000000 - - - - - - - - - - - - - main - - - main.c - 1 - .\source\main\main.c - - - - - core - - - cortex_m4.s - 2 - .\source\core\cortex_m4.s - - - core_cm3.c - 1 - .\source\core\core_cm3.c - - - system_stm32f10x.c - 1 - .\source\core\system_stm32f10x.c - - - startup_stm32f10x_md.s - 2 - .\source\core\startup_stm32f10x_md.s - - - - - stm32lib - - - misc.c - 1 - .\source\stm32lib\src\misc.c - - - stm32f10x_adc.c - 1 - .\source\stm32lib\src\stm32f10x_adc.c - - - stm32f10x_bkp.c - 1 - .\source\stm32lib\src\stm32f10x_bkp.c - - - stm32f10x_can.c - 1 - .\source\stm32lib\src\stm32f10x_can.c - - - stm32f10x_cec.c - 1 - .\source\stm32lib\src\stm32f10x_cec.c - - - stm32f10x_crc.c - 1 - .\source\stm32lib\src\stm32f10x_crc.c - - - stm32f10x_dac.c - 1 - .\source\stm32lib\src\stm32f10x_dac.c - - - stm32f10x_dbgmcu.c - 1 - .\source\stm32lib\src\stm32f10x_dbgmcu.c - - - stm32f10x_dma.c - 1 - .\source\stm32lib\src\stm32f10x_dma.c - - - stm32f10x_exti.c - 1 - .\source\stm32lib\src\stm32f10x_exti.c - - - stm32f10x_flash.c - 1 - .\source\stm32lib\src\stm32f10x_flash.c - - - stm32f10x_fsmc.c - 1 - .\source\stm32lib\src\stm32f10x_fsmc.c - - - stm32f10x_gpio.c - 1 - .\source\stm32lib\src\stm32f10x_gpio.c - - - stm32f10x_i2c.c - 1 - .\source\stm32lib\src\stm32f10x_i2c.c - - - stm32f10x_iwdg.c - 1 - .\source\stm32lib\src\stm32f10x_iwdg.c - - - stm32f10x_pwr.c - 1 - .\source\stm32lib\src\stm32f10x_pwr.c - - - stm32f10x_rcc.c - 1 - .\source\stm32lib\src\stm32f10x_rcc.c - - - stm32f10x_rtc.c - 1 - .\source\stm32lib\src\stm32f10x_rtc.c - - - stm32f10x_sdio.c - 1 - .\source\stm32lib\src\stm32f10x_sdio.c - - - stm32f10x_spi.c - 1 - .\source\stm32lib\src\stm32f10x_spi.c - - - stm32f10x_tim.c - 1 - .\source\stm32lib\src\stm32f10x_tim.c - - - stm32f10x_usart.c - 1 - .\source\stm32lib\src\stm32f10x_usart.c - - - stm32f10x_wwdg.c - 1 - .\source\stm32lib\src\stm32f10x_wwdg.c - - - - - interface - - - if_uart.c - 1 - .\source\interface\if_uart.c - - - if_rtt.c - 1 - .\source\interface\if_rtt.c - - - if_gpioin.c - 1 - .\source\interface\if_gpioin.c - - - if_gpioout.c - 1 - .\source\interface\if_gpioout.c - - - if_can.c - 1 - .\source\interface\if_can.c - - - - - dev - - - dev_flash.c - 1 - .\source\dev\dev_flash.c - - - dev_backup.c - 1 - .\source\dev\dev_backup.c - - - dev_watchdog.c - 1 - .\source\dev\dev_watchdog.c - - - - - elec_det - - - delay.c - 1 - .\source\elec_det\base\delay.c - - - utility.c - 1 - .\source\elec_det\base\utility.c - - - adc_cfg.c - 1 - .\source\elec_det\hardware\adc_cfg.c - - - dac_cfg.c - 1 - .\source\elec_det\hardware\dac_cfg.c - - - gpio_cfg.c - 1 - .\source\elec_det\hardware\gpio_cfg.c - - - hardware.c - 1 - .\source\elec_det\hardware\hardware.c - - - jw3425iic.c - 1 - .\source\elec_det\hardware\jw3425iic.c - - - power.c - 1 - .\source\elec_det\hardware\power.c - - - timer_cfg.c - 1 - .\source\elec_det\hardware\timer_cfg.c - - - EWDriver.c - 1 - .\source\elec_det\driver\EWDriver.c - - - JQDriver.c - 1 - .\source\elec_det\driver\JQDriver.c - - - LGDriver.c - 1 - .\source\elec_det\driver\LGDriver.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - XTDriver.c - 1 - .\source\elec_det\driver\XTDriver.c - - - BaseChecker.c - 1 - .\source\elec_det\interface\BaseChecker.c - - - JQChecker.c - 1 - .\source\elec_det\interface\JQChecker.c - - - XTChecker.c - 1 - .\source\elec_det\interface\XTChecker.c - - - EWChecker.c - 1 - .\source\elec_det\interface\EWChecker.c - - - EW_TestUsartApp.c - 1 - .\source\elec_det\test\EW_TestUsartApp.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - EWCheckerTest.c - 1 - .\source\elec_det\test\EWCheckerTest.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - Test.c - 1 - .\source\elec_det\test\Test.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - XTCheckerTest.c - 1 - .\source\elec_det\test\XTCheckerTest.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - elec_cmd.c - 1 - .\source\elec_det\elec_cmd.c - - - elec_det.c - 1 - .\source\elec_det\elec_det.c - - - elec_io.c - 1 - .\source\elec_det\elec_io.c - - - - - rtt - - - SEGGER_RTT.c - 1 - .\source\RTT\SEGGER_RTT.c - - - SEGGER_RTT_printf.c - 1 - .\source\RTT\SEGGER_RTT_printf.c - - - - - rt_thread - - - clock.c - 1 - .\source\rt_thread\src\clock.c - - - components.c - 1 - .\source\rt_thread\src\components.c - - - cpu.c - 1 - .\source\rt_thread\src\cpu.c - - - idle.c - 1 - .\source\rt_thread\src\idle.c - - - ipc.c - 1 - .\source\rt_thread\src\ipc.c - - - irq.c - 1 - .\source\rt_thread\src\irq.c - - - kservice.c - 1 - .\source\rt_thread\src\kservice.c - - - mem.c - 1 - .\source\rt_thread\src\mem.c - - - memheap.c - 1 - .\source\rt_thread\src\memheap.c - - - mempool.c - 1 - .\source\rt_thread\src\mempool.c - - - object.c - 1 - .\source\rt_thread\src\object.c - - - scheduler.c - 1 - .\source\rt_thread\src\scheduler.c - - - slab.c - 1 - .\source\rt_thread\src\slab.c - - - thread.c - 1 - .\source\rt_thread\src\thread.c - - - timer.c - 1 - .\source\rt_thread\src\timer.c - - - board.c - 1 - .\source\rt_thread\board.c - - - core_delay.c - 1 - .\source\rt_thread\core_delay.c - - - cpuport.c - 1 - .\source\rt_thread\libcpu\arm\cortex-m3\cpuport.c - - - context_rvds.S - 2 - .\source\rt_thread\libcpu\arm\cortex-m3\context_rvds.S - - - - - soft - - - buff.c - 1 - .\source\soft\buff.c - - - mystring.c - 1 - .\source\soft\mystring.c - - - mystdlib.c - 1 - .\source\soft\mystdlib.c - - - list.c - 1 - .\source\soft\list.c - - - signal.c - 1 - .\source\soft\signal.c - - - bytearray.c - 1 - .\source\soft\bytearray.c - - - sort.c - 1 - .\source\soft\sort.c - - - cJSON.c - 1 - .\source\soft\cJSON.c - - - debug.c - 1 - .\source\soft\debug.c - - - crc.c - 1 - .\source\soft\crc.c - - - mymisc.c - 1 - .\source\soft\mymisc.c - - - - - task - - - prot_uc.c - 1 - .\source\task\prot_uc.c - - - commend.c - 1 - .\source\task\commend.c - - - transmit.c - 1 - .\source\task\transmit.c - - - mod_signals.c - 1 - .\source\task\mod_signals.c - - - tran_for_slave.c - 1 - .\source\task\tran_for_slave.c - - - - - codec - - - codec.c - 1 - .\source\codec\codec.c - - - - - coder - - - PSDGenerate.c - 1 - .\source\coder\PSDGenerate.c - - - UIDGenerate.c - 1 - .\source\coder\UIDGenerate.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - coder_lib.c - 1 - .\source\coder\coder_lib.c - - - coder_judge.c - 1 - .\source\coder\coder_judge.c - - - JQ_PSDGenerate.c - 1 - .\source\coder\JQ_PSDGenerate.c - - - JQ_UIDGenerate.c - 1 - .\source\coder\JQ_UIDGenerate.c - - - - - readme - - - ReadMe.txt - 5 - .\source\ReadMe.txt - - - - - python - - - mycopy.py - 5 - .\source\mycopy.py - - - prebuild.py - 5 - .\source\prebuild.py - - - - - boot 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -1471,6 +185,7 @@ 0 0 0 + 0 0 0 8 @@ -1598,7 +313,7 @@ 1 - 1 + 4 0 0 1 @@ -1637,7 +352,7 @@ 0 0 0 - 0 + 4 @@ -2084,7 +799,7 @@ 2 2 2 - 2 + 0 @@ -3173,7 +1888,7 @@ 2 2 2 - 2 + 0 @@ -3530,62 +2245,6 @@ - - cJSON.c - 1 - .\source\soft\cJSON.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - debug.c 1 @@ -3652,6 +2311,11 @@ + + cJSON.c + 1 + .\source\soft\cJSON.c +
@@ -3715,7 +2379,7 @@ 2 2 2 - 2 + 0 @@ -3814,7 +2478,7 @@ 2 2 2 - 2 + 0 @@ -3893,7 +2557,7 @@ 2 2 2 - 2 + 0 @@ -3963,6 +2627,2478 @@
+ + app + 0x4 + ARM-ADS + 5060960::V5.06 update 7 (build 960)::.\ARMCC + 0 + + + STM32F103RC + STMicroelectronics + Keil.STM32F1xx_DFP.2.1.0 + http://www.keil.com/pack/ + IRAM(0x20000000,0xC000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE + + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)) + 0 + $$Device:STM32F103RC$Device\Include\stm32f10x.h + + + + + + + + + + $$Device:STM32F103RC$SVD\STM32F103xx.svd + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 1 + + .\Objects\app\ + checker_slave_app + 1 + 0 + 1 + 1 + 1 + .\Listings\ + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 1 + 0 + python source\prebuild.py + + 0 + 0 + 0 + 0 + + + 1 + 1 + fromelf.exe --bin -o "$L@L.bin" "#L" + python source\mycopy.py + 0 + 0 + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + SARMCM3.DLL + -REMAP + DCM.DLL + -pCM3 + SARMCM3.DLL + + TCM.DLL + -pCM3 + + + + 1 + 0 + 0 + 0 + 16 + + + + + 1 + 0 + 0 + 0 + 1 + 4096 + + 1 + BIN\UL2CM3.DLL + "" () + + + + + 0 + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M3" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 8 + 0 + 0 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0xc000 + + + 1 + 0x8000000 + 0x40000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x8004000 + 0x40000 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000020 + 0xc000 + + + 0 + 0x0 + 0x0 + + + + + + 1 + 4 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 1 + 1 + 0 + 3 + 3 + 1 + 1 + 0 + 0 + 0 + + --diag_suppress=550,177 --locale=english + STM32F10X_HD,USE_STDPERIPH_DRIVER,RT_THREAD + + .\source\interface;.\source\core;.\source\stm32lib\inc;.\source\main;.\source\RTT;.\source\rt_thread\include;.\source\rt_thread;.\source\soft;.\source\task;.\source\dev;.\source\codec;.\source\coder;.\source\elec_det + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + + + + + + + + + 1 + 0 + 0 + 0 + 1 + 0 + 0x08000000 + 0x20000000 + + + + + + + + + + + + + main + + + main.c + 1 + .\source\main\main.c + + + + + core + + + cortex_m4.s + 2 + .\source\core\cortex_m4.s + + + core_cm3.c + 1 + .\source\core\core_cm3.c + + + system_stm32f10x.c + 1 + .\source\core\system_stm32f10x.c + + + startup_stm32f10x_md.s + 2 + .\source\core\startup_stm32f10x_md.s + + + + + stm32lib + + + misc.c + 1 + .\source\stm32lib\src\misc.c + + + stm32f10x_adc.c + 1 + .\source\stm32lib\src\stm32f10x_adc.c + + + stm32f10x_bkp.c + 1 + .\source\stm32lib\src\stm32f10x_bkp.c + + + stm32f10x_can.c + 1 + .\source\stm32lib\src\stm32f10x_can.c + + + stm32f10x_cec.c + 1 + .\source\stm32lib\src\stm32f10x_cec.c + + + stm32f10x_crc.c + 1 + .\source\stm32lib\src\stm32f10x_crc.c + + + stm32f10x_dac.c + 1 + .\source\stm32lib\src\stm32f10x_dac.c + + + stm32f10x_dbgmcu.c + 1 + .\source\stm32lib\src\stm32f10x_dbgmcu.c + + + stm32f10x_dma.c + 1 + .\source\stm32lib\src\stm32f10x_dma.c + + + stm32f10x_exti.c + 1 + .\source\stm32lib\src\stm32f10x_exti.c + + + stm32f10x_flash.c + 1 + .\source\stm32lib\src\stm32f10x_flash.c + + + stm32f10x_fsmc.c + 1 + .\source\stm32lib\src\stm32f10x_fsmc.c + + + stm32f10x_gpio.c + 1 + .\source\stm32lib\src\stm32f10x_gpio.c + + + stm32f10x_i2c.c + 1 + .\source\stm32lib\src\stm32f10x_i2c.c + + + stm32f10x_iwdg.c + 1 + .\source\stm32lib\src\stm32f10x_iwdg.c + + + stm32f10x_pwr.c + 1 + .\source\stm32lib\src\stm32f10x_pwr.c + + + stm32f10x_rcc.c + 1 + .\source\stm32lib\src\stm32f10x_rcc.c + + + stm32f10x_rtc.c + 1 + .\source\stm32lib\src\stm32f10x_rtc.c + + + stm32f10x_sdio.c + 1 + .\source\stm32lib\src\stm32f10x_sdio.c + + + stm32f10x_spi.c + 1 + .\source\stm32lib\src\stm32f10x_spi.c + + + stm32f10x_tim.c + 1 + .\source\stm32lib\src\stm32f10x_tim.c + + + stm32f10x_usart.c + 1 + .\source\stm32lib\src\stm32f10x_usart.c + + + stm32f10x_wwdg.c + 1 + .\source\stm32lib\src\stm32f10x_wwdg.c + + + + + interface + + + if_uart.c + 1 + .\source\interface\if_uart.c + + + if_rtt.c + 1 + .\source\interface\if_rtt.c + + + if_gpioin.c + 1 + .\source\interface\if_gpioin.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + if_gpioout.c + 1 + .\source\interface\if_gpioout.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + if_can.c + 1 + .\source\interface\if_can.c + + + + + dev + + + dev_flash.c + 1 + .\source\dev\dev_flash.c + + + dev_backup.c + 1 + .\source\dev\dev_backup.c + + + dev_watchdog.c + 1 + .\source\dev\dev_watchdog.c + + + + + elec_det + + + delay.c + 1 + .\source\elec_det\base\delay.c + + + utility.c + 1 + .\source\elec_det\base\utility.c + + + adc_cfg.c + 1 + .\source\elec_det\hardware\adc_cfg.c + + + dac_cfg.c + 1 + .\source\elec_det\hardware\dac_cfg.c + + + gpio_cfg.c + 1 + .\source\elec_det\hardware\gpio_cfg.c + + + hardware.c + 1 + .\source\elec_det\hardware\hardware.c + + + jw3425iic.c + 1 + .\source\elec_det\hardware\jw3425iic.c + + + power.c + 1 + .\source\elec_det\hardware\power.c + + + timer_cfg.c + 1 + .\source\elec_det\hardware\timer_cfg.c + + + EWDriver.c + 1 + .\source\elec_det\driver\EWDriver.c + + + JQDriver.c + 1 + .\source\elec_det\driver\JQDriver.c + + + LGDriver.c + 1 + .\source\elec_det\driver\LGDriver.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + XTDriver.c + 1 + .\source\elec_det\driver\XTDriver.c + + + BaseChecker.c + 1 + .\source\elec_det\interface\BaseChecker.c + + + JQChecker.c + 1 + .\source\elec_det\interface\JQChecker.c + + + XTChecker.c + 1 + .\source\elec_det\interface\XTChecker.c + + + EWChecker.c + 1 + .\source\elec_det\interface\EWChecker.c + + + EW_TestUsartApp.c + 1 + .\source\elec_det\test\EW_TestUsartApp.c + + + EWCheckerTest.c + 1 + .\source\elec_det\test\EWCheckerTest.c + + + Test.c + 1 + .\source\elec_det\test\Test.c + + + XTCheckerTest.c + 1 + .\source\elec_det\test\XTCheckerTest.c + + + elec_cmd.c + 1 + .\source\elec_det\elec_cmd.c + + + elec_det.c + 1 + .\source\elec_det\elec_det.c + + + elec_io.c + 1 + .\source\elec_det\elec_io.c + + + + + rtt + + + SEGGER_RTT.c + 1 + .\source\RTT\SEGGER_RTT.c + + + SEGGER_RTT_printf.c + 1 + .\source\RTT\SEGGER_RTT_printf.c + + + + + rt_thread + + + clock.c + 1 + .\source\rt_thread\src\clock.c + + + components.c + 1 + .\source\rt_thread\src\components.c + + + cpu.c + 1 + .\source\rt_thread\src\cpu.c + + + idle.c + 1 + .\source\rt_thread\src\idle.c + + + ipc.c + 1 + .\source\rt_thread\src\ipc.c + + + irq.c + 1 + .\source\rt_thread\src\irq.c + + + kservice.c + 1 + .\source\rt_thread\src\kservice.c + + + mem.c + 1 + .\source\rt_thread\src\mem.c + + + memheap.c + 1 + .\source\rt_thread\src\memheap.c + + + mempool.c + 1 + .\source\rt_thread\src\mempool.c + + + object.c + 1 + .\source\rt_thread\src\object.c + + + scheduler.c + 1 + .\source\rt_thread\src\scheduler.c + + + slab.c + 1 + .\source\rt_thread\src\slab.c + + + thread.c + 1 + .\source\rt_thread\src\thread.c + + + timer.c + 1 + .\source\rt_thread\src\timer.c + + + board.c + 1 + .\source\rt_thread\board.c + + + core_delay.c + 1 + .\source\rt_thread\core_delay.c + + + cpuport.c + 1 + .\source\rt_thread\libcpu\arm\cortex-m3\cpuport.c + + + context_rvds.S + 2 + .\source\rt_thread\libcpu\arm\cortex-m3\context_rvds.S + + + + + soft + + + buff.c + 1 + .\source\soft\buff.c + + + mystring.c + 1 + .\source\soft\mystring.c + + + mystdlib.c + 1 + .\source\soft\mystdlib.c + + + list.c + 1 + .\source\soft\list.c + + + signal.c + 1 + .\source\soft\signal.c + + + bytearray.c + 1 + .\source\soft\bytearray.c + + + sort.c + 1 + .\source\soft\sort.c + + + debug.c + 1 + .\source\soft\debug.c + + + crc.c + 1 + .\source\soft\crc.c + + + mymisc.c + 1 + .\source\soft\mymisc.c + + + cJSON.c + 1 + .\source\soft\cJSON.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + + + task + + + prot_uc.c + 1 + .\source\task\prot_uc.c + + + commend.c + 1 + .\source\task\commend.c + + + transmit.c + 1 + .\source\task\transmit.c + + + mod_signals.c + 1 + .\source\task\mod_signals.c + + + tran_for_slave.c + 1 + .\source\task\tran_for_slave.c + + + + + codec + + + codec.c + 1 + .\source\codec\codec.c + + + + + coder + + + PSDGenerate.c + 1 + .\source\coder\PSDGenerate.c + + + UIDGenerate.c + 1 + .\source\coder\UIDGenerate.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + coder_lib.c + 1 + .\source\coder\coder_lib.c + + + coder_judge.c + 1 + .\source\coder\coder_judge.c + + + JQ_PSDGenerate.c + 1 + .\source\coder\JQ_PSDGenerate.c + + + JQ_UIDGenerate.c + 1 + .\source\coder\JQ_UIDGenerate.c + + + + + readme + + + ReadMe.txt + 5 + .\source\ReadMe.txt + + + + + python + + + mycopy.py + 5 + .\source\mycopy.py + + + prebuild.py + 5 + .\source\prebuild.py + + + + + + + app_debug + 0x4 + ARM-ADS + 5060960::V5.06 update 7 (build 960)::.\ARMCC + 0 + + + STM32F103RC + STMicroelectronics + Keil.STM32F1xx_DFP.2.1.0 + http://www.keil.com/pack/ + IRAM(0x20000000,0xC000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE + + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512 -FS08000000 -FL080000 -FP0($$Device:STM32F103RC$Flash\STM32F10x_512.FLM)) + 0 + $$Device:STM32F103RC$Device\Include\stm32f10x.h + + + + + + + + + + $$Device:STM32F103RC$SVD\STM32F103xx.svd + 0 + 0 + + + + + + + 0 + 0 + 0 + 0 + 1 + + .\Objects\app\ + checker_slave_app + 1 + 0 + 1 + 1 + 1 + .\Listings\ + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 1 + 0 + python source\prebuild.py + + 0 + 0 + 0 + 0 + + + 1 + 1 + fromelf.exe --bin -o "$L@L.bin" "#L" + python source\mycopy.py + 0 + 0 + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + 1 + + + SARMCM3.DLL + -REMAP + DCM.DLL + -pCM3 + SARMCM3.DLL + + TCM.DLL + -pCM3 + + + + 1 + 0 + 0 + 0 + 16 + + + + + 1 + 0 + 0 + 0 + 1 + 4096 + + 1 + BIN\UL2CM3.DLL + "" () + + + + + 0 + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M3" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 8 + 0 + 0 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000000 + 0xc000 + + + 1 + 0x8000000 + 0x40000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x8004000 + 0x40000 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x20000020 + 0xc000 + + + 0 + 0x0 + 0x0 + + + + + + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + 0 + 1 + 1 + 0 + 3 + 3 + 1 + 1 + 0 + 0 + 0 + + --diag_suppress=550,177 --locale=english + STM32F10X_HD,USE_STDPERIPH_DRIVER,RT_THREAD,DEBUG + + .\source\interface;.\source\core;.\source\stm32lib\inc;.\source\main;.\source\RTT;.\source\rt_thread\include;.\source\rt_thread;.\source\soft;.\source\task;.\source\dev;.\source\codec;.\source\coder;.\source\elec_det + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 4 + + + + + + + + + 1 + 0 + 0 + 0 + 1 + 0 + 0x08000000 + 0x20000000 + + + + + + + + + + + + + main + + + main.c + 1 + .\source\main\main.c + + + + + core + + + cortex_m4.s + 2 + .\source\core\cortex_m4.s + + + core_cm3.c + 1 + .\source\core\core_cm3.c + + + system_stm32f10x.c + 1 + .\source\core\system_stm32f10x.c + + + startup_stm32f10x_md.s + 2 + .\source\core\startup_stm32f10x_md.s + + + + + stm32lib + + + misc.c + 1 + .\source\stm32lib\src\misc.c + + + stm32f10x_adc.c + 1 + .\source\stm32lib\src\stm32f10x_adc.c + + + stm32f10x_bkp.c + 1 + .\source\stm32lib\src\stm32f10x_bkp.c + + + stm32f10x_can.c + 1 + .\source\stm32lib\src\stm32f10x_can.c + + + stm32f10x_cec.c + 1 + .\source\stm32lib\src\stm32f10x_cec.c + + + stm32f10x_crc.c + 1 + .\source\stm32lib\src\stm32f10x_crc.c + + + stm32f10x_dac.c + 1 + .\source\stm32lib\src\stm32f10x_dac.c + + + stm32f10x_dbgmcu.c + 1 + .\source\stm32lib\src\stm32f10x_dbgmcu.c + + + stm32f10x_dma.c + 1 + .\source\stm32lib\src\stm32f10x_dma.c + + + stm32f10x_exti.c + 1 + .\source\stm32lib\src\stm32f10x_exti.c + + + stm32f10x_flash.c + 1 + .\source\stm32lib\src\stm32f10x_flash.c + + + stm32f10x_fsmc.c + 1 + .\source\stm32lib\src\stm32f10x_fsmc.c + + + stm32f10x_gpio.c + 1 + .\source\stm32lib\src\stm32f10x_gpio.c + + + stm32f10x_i2c.c + 1 + .\source\stm32lib\src\stm32f10x_i2c.c + + + stm32f10x_iwdg.c + 1 + .\source\stm32lib\src\stm32f10x_iwdg.c + + + stm32f10x_pwr.c + 1 + .\source\stm32lib\src\stm32f10x_pwr.c + + + stm32f10x_rcc.c + 1 + .\source\stm32lib\src\stm32f10x_rcc.c + + + stm32f10x_rtc.c + 1 + .\source\stm32lib\src\stm32f10x_rtc.c + + + stm32f10x_sdio.c + 1 + .\source\stm32lib\src\stm32f10x_sdio.c + + + stm32f10x_spi.c + 1 + .\source\stm32lib\src\stm32f10x_spi.c + + + stm32f10x_tim.c + 1 + .\source\stm32lib\src\stm32f10x_tim.c + + + stm32f10x_usart.c + 1 + .\source\stm32lib\src\stm32f10x_usart.c + + + stm32f10x_wwdg.c + 1 + .\source\stm32lib\src\stm32f10x_wwdg.c + + + + + interface + + + if_uart.c + 1 + .\source\interface\if_uart.c + + + if_rtt.c + 1 + .\source\interface\if_rtt.c + + + if_gpioin.c + 1 + .\source\interface\if_gpioin.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + if_gpioout.c + 1 + .\source\interface\if_gpioout.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + if_can.c + 1 + .\source\interface\if_can.c + + + + + dev + + + dev_flash.c + 1 + .\source\dev\dev_flash.c + + + dev_backup.c + 1 + .\source\dev\dev_backup.c + + + dev_watchdog.c + 1 + .\source\dev\dev_watchdog.c + + + + + elec_det + + + delay.c + 1 + .\source\elec_det\base\delay.c + + + utility.c + 1 + .\source\elec_det\base\utility.c + + + adc_cfg.c + 1 + .\source\elec_det\hardware\adc_cfg.c + + + dac_cfg.c + 1 + .\source\elec_det\hardware\dac_cfg.c + + + gpio_cfg.c + 1 + .\source\elec_det\hardware\gpio_cfg.c + + + hardware.c + 1 + .\source\elec_det\hardware\hardware.c + + + jw3425iic.c + 1 + .\source\elec_det\hardware\jw3425iic.c + + + power.c + 1 + .\source\elec_det\hardware\power.c + + + timer_cfg.c + 1 + .\source\elec_det\hardware\timer_cfg.c + + + EWDriver.c + 1 + .\source\elec_det\driver\EWDriver.c + + + JQDriver.c + 1 + .\source\elec_det\driver\JQDriver.c + + + LGDriver.c + 1 + .\source\elec_det\driver\LGDriver.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + XTDriver.c + 1 + .\source\elec_det\driver\XTDriver.c + + + BaseChecker.c + 1 + .\source\elec_det\interface\BaseChecker.c + + + JQChecker.c + 1 + .\source\elec_det\interface\JQChecker.c + + + XTChecker.c + 1 + .\source\elec_det\interface\XTChecker.c + + + EWChecker.c + 1 + .\source\elec_det\interface\EWChecker.c + + + EW_TestUsartApp.c + 1 + .\source\elec_det\test\EW_TestUsartApp.c + + + EWCheckerTest.c + 1 + .\source\elec_det\test\EWCheckerTest.c + + + Test.c + 1 + .\source\elec_det\test\Test.c + + + XTCheckerTest.c + 1 + .\source\elec_det\test\XTCheckerTest.c + + + elec_cmd.c + 1 + .\source\elec_det\elec_cmd.c + + + elec_det.c + 1 + .\source\elec_det\elec_det.c + + + elec_io.c + 1 + .\source\elec_det\elec_io.c + + + + + rtt + + + SEGGER_RTT.c + 1 + .\source\RTT\SEGGER_RTT.c + + + SEGGER_RTT_printf.c + 1 + .\source\RTT\SEGGER_RTT_printf.c + + + + + rt_thread + + + clock.c + 1 + .\source\rt_thread\src\clock.c + + + components.c + 1 + .\source\rt_thread\src\components.c + + + cpu.c + 1 + .\source\rt_thread\src\cpu.c + + + idle.c + 1 + .\source\rt_thread\src\idle.c + + + ipc.c + 1 + .\source\rt_thread\src\ipc.c + + + irq.c + 1 + .\source\rt_thread\src\irq.c + + + kservice.c + 1 + .\source\rt_thread\src\kservice.c + + + mem.c + 1 + .\source\rt_thread\src\mem.c + + + memheap.c + 1 + .\source\rt_thread\src\memheap.c + + + mempool.c + 1 + .\source\rt_thread\src\mempool.c + + + object.c + 1 + .\source\rt_thread\src\object.c + + + scheduler.c + 1 + .\source\rt_thread\src\scheduler.c + + + slab.c + 1 + .\source\rt_thread\src\slab.c + + + thread.c + 1 + .\source\rt_thread\src\thread.c + + + timer.c + 1 + .\source\rt_thread\src\timer.c + + + board.c + 1 + .\source\rt_thread\board.c + + + core_delay.c + 1 + .\source\rt_thread\core_delay.c + + + cpuport.c + 1 + .\source\rt_thread\libcpu\arm\cortex-m3\cpuport.c + + + context_rvds.S + 2 + .\source\rt_thread\libcpu\arm\cortex-m3\context_rvds.S + + + + + soft + + + buff.c + 1 + .\source\soft\buff.c + + + mystring.c + 1 + .\source\soft\mystring.c + + + mystdlib.c + 1 + .\source\soft\mystdlib.c + + + list.c + 1 + .\source\soft\list.c + + + signal.c + 1 + .\source\soft\signal.c + + + bytearray.c + 1 + .\source\soft\bytearray.c + + + sort.c + 1 + .\source\soft\sort.c + + + debug.c + 1 + .\source\soft\debug.c + + + crc.c + 1 + .\source\soft\crc.c + + + mymisc.c + 1 + .\source\soft\mymisc.c + + + cJSON.c + 1 + .\source\soft\cJSON.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + + + task + + + prot_uc.c + 1 + .\source\task\prot_uc.c + + + commend.c + 1 + .\source\task\commend.c + + + transmit.c + 1 + .\source\task\transmit.c + + + mod_signals.c + 1 + .\source\task\mod_signals.c + + + tran_for_slave.c + 1 + .\source\task\tran_for_slave.c + + + + + codec + + + codec.c + 1 + .\source\codec\codec.c + + + + + coder + + + PSDGenerate.c + 1 + .\source\coder\PSDGenerate.c + + + UIDGenerate.c + 1 + .\source\coder\UIDGenerate.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + coder_lib.c + 1 + .\source\coder\coder_lib.c + + + coder_judge.c + 1 + .\source\coder\coder_judge.c + + + JQ_PSDGenerate.c + 1 + .\source\coder\JQ_PSDGenerate.c + + + JQ_UIDGenerate.c + 1 + .\source\coder\JQ_UIDGenerate.c + + + + + readme + + + ReadMe.txt + 5 + .\source\ReadMe.txt + + + + + python + + + mycopy.py + 5 + .\source\mycopy.py + + + prebuild.py + 5 + .\source\prebuild.py + + + + + @@ -3971,4 +5107,13 @@ + + + + checher_slave + 1 + + + + diff --git a/source/ReadMe.txt b/source/ReadMe.txt index b1dba71..ceee94c 100644 --- a/source/ReadMe.txt +++ b/source/ReadMe.txt @@ -207,5 +207,6 @@ 2023.10.12 移植Test命令,验证成功 EJ EX 写工厂信息验证成功 - - +2023.10.12 + 添加 app_debug 分类 ,app 分类禁用调试,程序压缩到100k以下 + app启动时如果boot魔数校验错误则自动升级bootloader diff --git a/source/codec/codec.c b/source/codec/codec.c index b8e2bdd..2b74911 100644 --- a/source/codec/codec.c +++ b/source/codec/codec.c @@ -195,7 +195,7 @@ array_def *protu_encode2(protu_def *p,array_def *data) -protuc_codec_export(ym_coder,protu_decode2,protu_encode2); +//protuc_codec_export(ym_coder,protu_decode2,protu_encode2); diff --git a/source/dev/dev_backup.c b/source/dev/dev_backup.c index 1441c6f..8ca4265 100644 --- a/source/dev/dev_backup.c +++ b/source/dev/dev_backup.c @@ -16,6 +16,7 @@ typedef struct{ uint32_t reboot_curr;// 最后一次复位标志 void (*wdog_refresh)(void);// 刷新看门口 uint32_t reboot_times;// 软件重启次数 + uint32_t boot_magic_number;// app校验boot是否为指定版本 }back_def; @@ -79,7 +80,7 @@ void bk_init(void) g_back->reboot_curr=g_back->reboot_type; g_back->reboot_type=REBOOT_INIT; g_back->wdog_refresh=0; - + g_back->boot_magic_number=BOOT_MAGIC_NUM; // 每软件重启一次就增加计数 if(bk_soft_reboot()) { @@ -146,4 +147,13 @@ void *bk_wdog_fun(void) return g_back->wdog_refresh; } +// 校验魔数,不对返回1 +int bk_check_magic_num(void) +{ + if(g_back->boot_magic_number!=BOOT_MAGIC_NUM){ + return 1; + } + return 0; +} + diff --git a/source/dev/dev_backup.h b/source/dev/dev_backup.h index ba273f2..5f56074 100644 --- a/source/dev/dev_backup.h +++ b/source/dev/dev_backup.h @@ -14,6 +14,10 @@ #define REBOOT_INIT 0xffff +// 定义boot魔数 +#define BOOT_MAGIC_NUM ((uint32_t)(('b')<<0)|(('o')<<8)|(('o')<<16)|(('t')<<24)) + + void bk_reboot_app(void); void bk_reboot_boot(void); void bk_reboot_updata(void); @@ -26,6 +30,7 @@ const char *bk_get_currtype(void); void bk_set_wdog_fun(void (*fun)(void)); void *bk_wdog_fun(void); uint32_t bk_reboot_times(void); +int bk_check_magic_num(void); diff --git a/source/dev/dev_flash.c b/source/dev/dev_flash.c index eb269d9..6310798 100644 --- a/source/dev/dev_flash.c +++ b/source/dev/dev_flash.c @@ -33,6 +33,8 @@ scheme 109~110 */ #define FLASH_SECTOR_SIZE 2048 +#define FLASH_BOOT_SECTOR (0) +#define FLASH_BOOT_SECTOR_NUM (8) #define FLASH_APP_SECTOR (8) #define FLASH_APP_SECTOR_NUM (50) #define FLASH_BUFF_SECTOR (58) @@ -145,7 +147,16 @@ int flash_operate_end(void) return 0; } - +// boot区 +int flash_erase_boot(void) +{ + int ret; + for(int i=0;i0: + if(len(data)>=20): + t=data[0:20] + data=data[20:] + else: + t=data + data=[] + s=t.hex(" ") + s="0x"+s.replace(" ",",0x")+",\n" + f.write(s) + def main(): + creat_bootcode(BOOTCODE_ARRAY) creat_compile_info(INFO_FILE) mod_file_creat(MOD_PATH+MOD_FILE) print("prepare success.\n") diff --git a/source/rt_thread/board.h b/source/rt_thread/board.h index 61e5b4c..495bde4 100644 --- a/source/rt_thread/board.h +++ b/source/rt_thread/board.h @@ -175,12 +175,17 @@ void param_err_handle(const char *param,const char *file,const char *fun,int lin void cpy4byte(uint32_t *dst,uint32_t *src,int num_4byte); + +#ifdef DEBUG // 如果s==0,则打印 #define param_check(s) \ if((s)==0){\ param_err_handle(#s,__FILE__,__func__,__LINE__);} +#else +#define param_check(s) +#endif #ifdef RT_THREAD diff --git a/source/rt_thread/rtconfig.h b/source/rt_thread/rtconfig.h index 46d6244..b856f15 100644 --- a/source/rt_thread/rtconfig.h +++ b/source/rt_thread/rtconfig.h @@ -134,18 +134,18 @@ // Console Configuration // Using console // Using console -#define RT_USING_CONSOLE +//#define RT_USING_CONSOLE // // the buffer size of console <1-1024> // the buffer size of console // Default: 128 (128Byte) -#define RT_CONSOLEBUF_SIZE 128 +//#define RT_CONSOLEBUF_SIZE 128 // The device name for console // The device name for console // Default: uart2 -#define RT_CONSOLE_DEVICE_NAME "uart2" +//#define RT_CONSOLE_DEVICE_NAME "uart2" // #if defined(RTE_USING_DEVICE) @@ -202,5 +202,8 @@ #define IDLE_THREAD_STACK_SIZE 1024 +#define RT_USING_CPU_FFS + + #endif diff --git a/source/soft/debug.c b/source/soft/debug.c index f39c7ea..6dca1fe 100644 --- a/source/soft/debug.c +++ b/source/soft/debug.c @@ -38,7 +38,7 @@ - +#ifdef DEBUG typedef struct{ int inited; @@ -95,7 +95,7 @@ void debug_log(const char *file,const char *fun,int line,int level,const char *f #endif } - +#endif diff --git a/source/soft/debug.h b/source/soft/debug.h index 4806e02..467276a 100644 --- a/source/soft/debug.h +++ b/source/soft/debug.h @@ -9,8 +9,11 @@ /*r{ 修改日志打印等级 }c*/ +#ifdef DEBUG #define DBG_LOG_LEVEL 0 - +#else +#define DBG_LOG_LEVEL 4 +#endif /*r{ 定义打印数据等级 }c*/ @@ -51,9 +54,17 @@ //#define DBG_LOG_(type_,msg_,...)\ // debug_log("-","-",__LINE__,type_,(msg_),##__VA_ARGS__) +#ifdef DEBUG int debug_init(void); void debug_log(const char *file,const char *fun,int line,int level,const char *fmt, ...); +#else + +#define debug_init() +#define debug_log(...) + + +#endif