From 05cee4910b9a4de34d24b8136bd86a35b60c6da3 Mon Sep 17 00:00:00 2001 From: yuliang Date: Sun, 27 Apr 2025 17:01:26 +0800 Subject: [PATCH] =?UTF-8?q?FIX=20|=20=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EWARM/CableMonitor_V3.2.dep | 826 +++++++++--------- .../EWARM/settings/CableMonitor_V3.2.dbgdt | 8 +- .../EWARM/settings/CableMonitor_V3.2.dnx | 2 +- .../EWARM/settings/Project.wsdt | 12 +- CablePositioning_IAP_V1.0/Inc/common.h | 5 +- CablePositioning_IAP_V1.0/Src/common.c | 3 - 6 files changed, 425 insertions(+), 431 deletions(-) diff --git a/CablePositioning_IAP_V1.0/EWARM/CableMonitor_V3.2.dep b/CablePositioning_IAP_V1.0/EWARM/CableMonitor_V3.2.dep index 805c8d2..4d076c3 100644 --- a/CablePositioning_IAP_V1.0/EWARM/CableMonitor_V3.2.dep +++ b/CablePositioning_IAP_V1.0/EWARM/CableMonitor_V3.2.dep @@ -5,547 +5,484 @@ CableMonitor_V3.2 + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr_ex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cortex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim_ex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + $PROJ_DIR$\CableMonitor_V3.2\Obj\flash_if.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c_ex.__cstat.et + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim.c + $PROJ_DIR$\..\Src\ymodem.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi_ex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_gpio.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash.c + $PROJ_DIR$\CableMonitor_V3.2\Exe\CableMonitor_V3.2.out + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_exti.c + $PROJ_DIR$\..\Src\common.c $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal.c + $PROJ_DIR$\..\Src\stm32l4xx_it.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi.c + $PROJ_DIR$\..\Src\menu.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc.c $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc_ex.c - $PROJ_DIR$\..\Src\common.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ex.c $PROJ_DIR$\..\Src\system_stm32l4xx.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c_ex.c $PROJ_DIR$\..\Src\main.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi_ex.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc.c - $PROJ_DIR$\startup_stm32l496xx.s - $PROJ_DIR$\..\Src\menu.c - $PROJ_DIR$\..\Src\stm32l4xx_it.c - $PROJ_DIR$\..\Src\stm32l4xx_hal_msp.c - $PROJ_DIR$\..\Src\ymodem.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma_ex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ramfunc.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c.c $PROJ_DIR$\..\Src\flash_if.c - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal.o - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_cortex.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c_ex.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart_ex.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_gpio.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_msp.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\flash_if.o - $PROJ_DIR$\..\Inc\ymodem.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim.__cstat.et - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_flash.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\system_stm32l4xx.__cstat.et - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_gpio_ex.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ramfunc.o - $TOOLKIT_DIR$\inc\c\stdio.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ex.__cstat.et - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_spi_ex.h - $TOOLKIT_DIR$\lib\shb_l.a - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal.__cstat.et + $PROJ_DIR$\..\Src\stm32l4xx_hal_msp.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr.c + $PROJ_DIR$\startup_stm32l496xx.s + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_flash_ramfunc.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\main.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\menu.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma_ex.o + $TOOLKIT_DIR$\inc\c\stdint.h + $TOOLKIT_DIR$\inc\c\iccarm_builtin.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim_ex.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\startup_stm32l496xx.o $PROJ_DIR$\..\Inc\menu.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal.__cstat.et + $PROJ_DIR$\stm32l496xx_flash.icf + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c_ex.o $PROJ_DIR$\CableMonitor_V3.2\Obj\menu.o - $TOOLKIT_DIR$\lib\dl7M_tlf.a - $TOOLKIT_DIR$\inc\c\ycheck.h - $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32L4xx\Include\system_stm32l4xx.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_dma.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h - $TOOLKIT_DIR$\inc\c\DLib_Config_Full.h - $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_compiler.h $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma.pbi - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_cortex.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_msp.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma_ex.pbi + $TOOLKIT_DIR$\inc\c\DLib_Product_string.h + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_flash.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ex.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma.__cstat.et + $TOOLKIT_DIR$\inc\c\DLib_Config_Full.h $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim.pbi - $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_iccarm.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_flash_ramfunc.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim_ex.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\flash_if.pbi + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_spi_ex.h $PROJ_DIR$\CableMonitor_V3.2\Obj\main.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr_ex.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_it.__cstat.et + $TOOLKIT_DIR$\inc\c\DLib_Product.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ex.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_gpio.o + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_cortex.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim_ex.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi_ex.__cstat.et $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_uart_ex.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_msp.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal.o + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal.h + $TOOLKIT_DIR$\inc\c\stdio.h + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_gpio_ex.h $TOOLKIT_DIR$\inc\c\ysizet.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c_ex.o - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_pwr_ex.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_cortex.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ex.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c.o - $PROJ_DIR$\CableMonitor_V3.2\Exe\CableMonitor_V3.2.out - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ex.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim_ex.pbi $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc_ex.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\main.__cstat.et - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_uart.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_it.__cstat.et - $PROJ_DIR$\..\Inc\stm32l4xx_it.h + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_dma.h $PROJ_DIR$\CableMonitor_V3.2\Obj\ymodem.o - $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32L4xx\Include\stm32l4xx.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\flash_if.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\menu.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_gpio.pbi - $TOOLKIT_DIR$\inc\c\stdint.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma_ex.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_msp.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma_ex.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_gpio.o - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_rcc_ex.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim_ex.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\CableMonitor_V3.2.pbd $PROJ_DIR$\CableMonitor_V3.2\Obj\system_stm32l4xx.pbi - $TOOLKIT_DIR$\inc\c\iccarm_builtin.h - $TOOLKIT_DIR$\inc\c\DLib_Product.h - $TOOLKIT_DIR$\inc\c\yvals.h - $TOOLKIT_DIR$\inc\c\stdarg.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_msp.__cstat.et $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_it.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c.__cstat.et - $PROJ_DIR$\stm32l496xx_flash.icf - $PROJ_DIR$\CableMonitor_V3.2\Exe\CableMonitor_V3.2.bin - $PROJ_DIR$\..\Inc\stm32l4xx_hal_conf.h - $TOOLKIT_DIR$\inc\c\DLib_Product_string.h $PROJ_DIR$\CableMonitor_V3.2\Obj\common.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc_ex.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr.pbi - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_spi.h + $PROJ_DIR$\..\Inc\ymodem.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\CableMonitor_V3.2.pbd + $TOOLKIT_DIR$\lib\dl7M_tlf.a + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_uart.h + $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_compiler.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim.o + $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_iccarm.h + $PROJ_DIR$\..\Inc\stm32l4xx_it.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash.pbi + $TOOLKIT_DIR$\inc\c\ycheck.h + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_cortex.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim_ex.__cstat.et $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_exti.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart_ex.__cstat.et - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_gpio.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\flash_if.__cstat.et - $PROJ_DIR$\..\Inc\main.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr_ex.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\system_stm32l4xx.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi_ex.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_gpio.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc_ex.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc.pbi + $PROJ_DIR$\..\Inc\common.h + $PROJ_DIR$\CableMonitor_V3.2\Exe\CableMonitor_V3.2.bin + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart.pbi $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\startup_stm32l496xx.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_tim.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc.__cstat.et + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_gpio.h + $PROJ_DIR$\..\Inc\stm32l4xx_hal_conf.h + $PROJ_DIR$\CableMonitor_V3.2\List\CableMonitor_V3.2.map + $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32L4xx\Include\system_stm32l4xx.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_cortex.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_exti.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_exti.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_gpio.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\common.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart_ex.o + $TOOLKIT_DIR$\lib\shb_l.a + $TOOLKIT_DIR$\inc\c\yvals.h $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_flash_ex.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi_ex.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ramfunc.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\common.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc_ex.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi_ex.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\system_stm32l4xx.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart_ex.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ex.pbi $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_dma_ex.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_exti.__cstat.et - $PROJ_DIR$\..\Drivers\CMSIS\Include\core_cm4.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_rcc.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart_ex.o - $TOOLKIT_DIR$\lib\m7M_tls.a + $TOOLKIT_DIR$\inc\c\stdarg.h + $PROJ_DIR$\..\Inc\main.h $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr_ex.o - $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32L4xx\Include\stm32l496xx.h - $PROJ_DIR$\CableMonitor_V3.2\List\CableMonitor_V3.2.map + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi.pbi + $PROJ_DIR$\..\Inc\flash_if.h $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_def.h + $TOOLKIT_DIR$\inc\c\DLib_Defaults.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\flash_if.__cstat.et + $TOOLKIT_DIR$\lib\m7M_tls.a + $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_version.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal.pbi + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_exti.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_exti.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\system_stm32l4xx.o + $TOOLKIT_DIR$\inc\c\stddef.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart_ex.pbi + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_pwr_ex.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash.o $PROJ_DIR$\..\Drivers\CMSIS\Include\mpu_armv7.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\common.__cstat.et - $PROJ_DIR$\CableMonitor_V3.2\Obj\ymodem.__cstat.et - $PROJ_DIR$\..\Inc\flash_if.h - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_exti.pbi + $PROJ_DIR$\CableMonitor_V3.2\Obj\common.pbi + $TOOLKIT_DIR$\lib\rt7M_tl.a $PROJ_DIR$\CableMonitor_V3.2\Obj\menu.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_msp.__cstat.et $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ramfunc.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc.pbi - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi.__cstat.et - $TOOLKIT_DIR$\inc\c\stddef.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ramfunc.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi_ex.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart.__cstat.et + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_rcc_ex.h + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_rcc.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc_ex.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\ymodem.pbi $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_it.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr_ex.__cstat.et - $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_version.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c.c + $PROJ_DIR$\CableMonitor_V3.2\Obj\ymodem.__cstat.et + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi.__cstat.et $PROJ_DIR$\CableMonitor_V3.2\Obj\main.o - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ex.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_gpio.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_exti.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_cortex.o $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_pwr.h - $PROJ_DIR$\..\Inc\common.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim.c - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_rcc.__cstat.et + $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32L4xx\Include\stm32l496xx.h + $PROJ_DIR$\..\Drivers\CMSIS\Include\core_cm4.h + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_flash_ramfunc.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_cortex.o + $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr_ex.__cstat.et $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_i2c_ex.pbi - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_exti.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim_ex.c $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_pwr.__cstat.et - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ramfunc.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Inc\stm32l4xx_hal_spi.h + $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32L4xx\Include\stm32l4xx.h $TOOLKIT_DIR$\inc\c\string.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma_ex.c - $TOOLKIT_DIR$\lib\rt7M_tl.a - $TOOLKIT_DIR$\inc\c\DLib_Defaults.h - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c_ex.c - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cortex.c - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_uart.__cstat.et - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr_ex.c - $PROJ_DIR$\CableMonitor_V3.2\Obj\stm32l4xx_hal_spi_ex.o - $PROJ_DIR$\CableMonitor_V3.2\Obj\ymodem.pbi [ROOT_NODE] ILINK - 59 128 + 13 109 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr_ex.c - - ICCARM - 14 - __cstat - 33 - - - BICOMP - 120 - - - - - ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 - - - BICOMP - 99 83 129 44 130 55 104 25 127 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 168 - - - - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc_ex.c - ICCARM - 95 - - - __cstat - 62 + 126 BICOMP - 115 + 94 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 15 83 129 68 130 55 122 37 92 78 139 73 85 123 104 39 44 159 25 153 99 64 40 127 38 110 52 142 42 166 41 84 47 53 27 48 31 + 91 38 129 171 144 142 107 51 164 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Src\common.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cortex.c - - ICCARM - 94 - __cstat - 131 - - - BICOMP - 113 + 111 - - ICCARM - 29 37 85 166 41 84 53 163 93 106 15 92 123 129 68 127 122 73 142 42 47 83 130 38 40 139 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 34 133 23 154 + 167 BICOMP - 15 73 37 34 53 68 85 86 133 93 92 129 122 55 23 163 106 154 166 41 84 123 104 39 44 159 25 153 99 64 78 139 130 83 110 52 29 40 127 38 142 42 47 27 48 31 - - - - - $PROJ_DIR$\..\Src\system_stm32l4xx.c - - - ICCARM - 117 - - - __cstat - 26 - - - BICOMP - 82 + 64 ICCARM - 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 15 92 123 129 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 15 130 129 83 68 55 122 37 73 85 127 38 92 78 139 110 52 142 42 166 41 84 47 123 104 39 44 159 25 153 99 64 40 53 27 48 31 + 38 165 129 144 142 172 71 90 108 154 140 37 118 155 107 76 91 136 51 163 171 84 63 164 110 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Src\main.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart.c - ICCARM - 144 + __cstat + 153 - __cstat - 63 + ICCARM + 120 BICOMP - 50 + 103 ICCARM - 106 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 154 133 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 129 68 73 15 31 92 122 85 133 78 139 142 37 166 41 53 48 154 123 104 39 44 159 25 153 99 64 40 127 38 42 84 47 27 106 130 83 110 55 52 + 164 38 51 129 107 144 142 91 171 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim_ex.c - ICCARM - 118 + __cstat + 92 - __cstat - 138 + ICCARM + 39 BICOMP - 71 + 66 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 139 129 78 73 92 68 15 122 85 110 52 123 104 39 44 159 25 153 99 64 40 127 38 130 83 37 55 142 42 166 41 84 47 53 27 48 31 + 38 171 129 91 144 142 107 51 164 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi_ex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c - ICCARM - 172 + __cstat + 121 - __cstat - 111 + ICCARM + 116 BICOMP - 116 + 141 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 83 122 129 130 55 68 15 37 92 78 139 73 85 123 104 39 44 159 25 153 99 64 40 127 38 110 52 142 42 166 41 84 47 53 27 48 31 + 129 172 38 71 144 142 165 90 108 154 140 37 118 155 107 76 91 136 51 163 171 84 63 164 110 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma.c - ICCARM - 21 + __cstat + 53 - __cstat - 157 + ICCARM + 104 BICOMP - 137 + 47 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 122 83 129 130 55 68 15 37 92 78 139 73 85 123 104 39 44 159 25 153 99 64 40 127 38 110 52 142 42 166 41 84 47 53 27 48 31 + 108 38 129 154 37 144 142 140 90 172 71 165 118 155 107 76 91 136 51 163 171 84 63 164 110 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\startup_stm32l496xx.s + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim.c - AARM - 109 + __cstat + 105 - - - - $PROJ_DIR$\..\Src\menu.c - ICCARM - 35 - - - __cstat - 135 + 86 BICOMP - 70 + 55 ICCARM - 106 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 154 133 34 23 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 44 23 99 104 25 127 85 133 123 39 159 153 64 40 38 130 83 37 129 55 15 154 34 92 78 68 139 122 73 110 52 106 142 42 166 41 84 47 53 27 48 31 + 38 171 129 91 144 142 107 51 164 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Src\stm32l4xx_it.c + $PROJ_DIR$\..\Src\ymodem.c - ICCARM - 140 + __cstat + 160 - __cstat - 65 + ICCARM + 77 BICOMP - 88 + 158 ICCARM - 106 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 66 + 128 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 101 81 173 50 125 41 BICOMP - 92 78 73 37 129 139 85 27 68 15 122 42 84 47 66 123 104 39 44 159 25 153 99 64 40 127 38 142 166 41 53 48 31 106 130 83 110 55 52 + 129 90 154 37 128 125 71 140 118 73 81 108 172 165 85 60 87 74 101 173 41 155 107 76 91 136 51 163 171 84 63 164 110 134 130 54 33 57 50 144 38 119 142 68 - $PROJ_DIR$\..\Src\stm32l4xx_hal_msp.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi_ex.c - ICCARM - 75 + __cstat + 67 - __cstat - 87 + ICCARM + 152 BICOMP - 20 + 97 ICCARM - 106 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 99 83 129 44 130 55 104 25 127 37 15 123 39 159 153 64 40 38 85 92 78 68 139 122 73 110 52 106 142 42 166 41 84 47 53 27 48 31 + 38 165 129 144 142 172 71 90 108 154 140 37 118 155 107 76 91 136 51 163 171 84 63 164 110 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Src\ymodem.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_gpio.c - ICCARM - 67 + __cstat + 114 - __cstat - 132 + ICCARM + 62 BICOMP - 173 + 98 ICCARM - 133 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 154 23 163 93 106 34 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 129 37 78 73 133 106 15 139 85 27 23 92 68 122 42 84 47 53 154 163 34 123 104 39 44 159 25 153 99 64 40 127 38 142 166 41 48 31 93 130 83 110 55 52 + 164 38 51 129 107 144 142 91 171 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Src\flash_if.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash.c - ICCARM - 22 + __cstat + 44 - __cstat - 105 + ICCARM + 143 BICOMP - 69 + 89 ICCARM - 106 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 154 133 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 92 122 73 129 31 68 15 85 133 78 139 142 37 166 41 53 48 154 123 104 39 44 159 25 153 99 64 40 127 38 42 84 47 27 106 130 83 110 55 52 + 107 38 129 51 164 144 142 91 171 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 @@ -554,314 +491,341 @@ ILINK - 128 + 109 OBJCOPY - 91 + 102 ILINK - 90 94 22 144 35 109 14 152 107 74 101 96 57 28 77 58 54 75 156 126 21 95 118 172 79 49 108 124 140 117 67 32 165 125 36 + 43 80 5 162 46 40 70 167 104 36 112 143 52 166 62 96 45 48 148 126 138 156 157 152 86 39 120 116 159 139 77 117 146 133 83 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_exti.c - ICCARM - 58 + __cstat + 137 - __cstat - 89 + ICCARM + 112 BICOMP - 100 + 113 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 83 99 129 44 130 55 104 25 127 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 76 38 63 129 163 144 142 155 136 84 110 90 107 91 51 171 164 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ex.c + $PROJ_DIR$\..\Src\common.c - ICCARM - 57 + __cstat + 115 - __cstat - 30 + ICCARM + 80 BICOMP - 60 + 145 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 72 90 118 130 54 60 74 173 50 125 71 108 155 129 172 164 165 37 134 85 87 38 144 110 63 140 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 41 128 81 101 BICOMP - 83 15 129 68 130 55 122 37 92 78 139 73 85 123 104 39 44 159 25 153 99 64 40 127 38 110 52 142 42 166 41 84 47 53 27 48 31 + 118 129 90 41 50 108 140 124 128 74 71 154 37 144 38 119 68 173 125 101 130 54 60 155 107 76 91 136 51 163 171 84 172 165 142 81 72 63 164 110 134 85 87 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_gpio.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal.c - ICCARM - 77 + __cstat + 42 - __cstat - 19 + ICCARM + 70 BICOMP - 72 + 135 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 127 83 25 129 104 130 55 44 99 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 171 38 129 91 144 142 107 51 164 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma.c + $PROJ_DIR$\..\Src\stm32l4xx_it.c - ICCARM - 107 + __cstat + 59 - __cstat - 102 + ICCARM + 159 BICOMP - 43 + 79 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 125 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 88 BICOMP - 92 83 129 78 73 130 55 139 37 68 15 122 85 123 104 39 44 159 25 153 99 64 40 127 38 110 52 142 42 166 41 84 47 53 27 48 31 + 108 154 37 90 129 140 118 73 172 71 165 85 60 87 88 155 107 76 91 136 51 163 171 84 63 164 110 134 130 54 74 33 57 125 144 38 119 142 68 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_spi.c - - ICCARM - 156 - __cstat 161 + + ICCARM + 157 + BICOMP - 98 + 127 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 104 83 129 25 127 130 55 44 99 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 140 129 154 37 108 172 71 165 118 119 68 155 107 76 91 136 51 163 171 84 63 164 110 144 38 90 142 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_exti.c + $PROJ_DIR$\..\Src\menu.c - ICCARM - 101 + __cstat + 147 - __cstat - 121 + ICCARM + 46 BICOMP - 134 + 35 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 125 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 101 128 41 81 BICOMP - 39 83 40 129 153 130 55 123 159 64 38 37 104 44 25 99 127 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 91 81 171 107 51 164 118 128 155 76 136 163 84 63 110 144 38 90 129 142 71 101 41 108 154 172 140 165 37 119 68 125 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc.c - ICCARM - 108 + __cstat + 106 - __cstat - 170 + ICCARM + 138 BICOMP - 114 + 100 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 127 83 25 129 104 130 55 44 99 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 165 38 129 144 142 172 71 90 108 154 140 37 118 155 107 76 91 136 51 163 171 84 63 164 110 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_uart_ex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_rcc_ex.c - ICCARM - 124 + __cstat + 75 - __cstat - 103 + ICCARM + 156 BICOMP - 18 + 99 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 129 68 83 15 130 55 122 37 92 78 139 73 85 123 104 39 44 159 25 153 99 64 40 127 38 110 52 142 42 166 41 84 47 53 27 48 31 + 71 38 129 172 144 142 165 90 108 154 140 37 118 155 107 76 91 136 51 163 171 84 63 164 110 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ex.c - ICCARM - 79 + __cstat + 61 - __cstat - 24 + ICCARM + 52 BICOMP - 46 + 122 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 83 99 129 44 130 55 104 25 127 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 38 71 129 172 144 142 165 90 108 154 140 37 118 155 107 76 91 136 51 163 171 84 63 164 110 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_tim_ex.c + $PROJ_DIR$\..\Src\system_stm32l4xx.c - ICCARM - 49 + __cstat + 95 - __cstat - 80 + ICCARM + 139 BICOMP - 61 + 78 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 71 108 155 129 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 83 99 129 44 130 55 104 25 127 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 71 144 129 38 172 142 165 90 37 118 164 110 108 154 140 119 68 134 85 130 54 60 87 155 107 76 91 136 51 163 171 84 63 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ramfunc.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c_ex.c + + __cstat + 6 + + + ICCARM + 45 + + + BICOMP + 169 + + + ICCARM - 28 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 + + BICOMP + 38 171 129 91 144 142 107 51 164 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 + + + + + $PROJ_DIR$\..\Src\main.c + __cstat - 112 + 34 + + + ICCARM + 162 BICOMP - 136 + 58 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 125 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 101 128 BICOMP - 83 78 73 129 92 130 55 139 37 68 15 122 85 123 104 39 44 159 25 153 99 64 40 127 38 110 52 142 42 166 41 84 47 53 27 48 31 + 129 172 37 71 57 108 165 118 128 154 140 134 90 130 54 74 33 101 155 107 76 91 136 51 163 171 84 63 164 110 85 60 87 73 125 144 38 119 142 68 @@ -869,136 +833,168 @@ $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_dma_ex.c - ICCARM - 74 + __cstat + 123 - __cstat - 119 + ICCARM + 36 BICOMP - 76 + 49 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 83 99 129 44 130 55 104 25 127 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 38 171 129 91 144 142 107 51 164 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_flash_ramfunc.c - ICCARM - 96 + __cstat + 151 - __cstat - 97 + ICCARM + 166 BICOMP - 45 + 150 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 104 83 129 25 127 130 55 44 99 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 38 154 37 129 108 144 142 140 90 172 71 165 118 155 107 76 91 136 51 163 171 84 63 164 110 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c_ex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_i2c.c - ICCARM - 54 + __cstat + 65 - __cstat - 17 + ICCARM + 96 BICOMP - 158 + 93 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 83 99 129 44 130 55 104 25 127 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 38 171 129 91 144 142 107 51 164 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_cortex.c + $PROJ_DIR$\..\Src\flash_if.c + + __cstat + 132 + ICCARM - 152 + 5 - __cstat + BICOMP 56 + + + + ICCARM + 125 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 101 128 + + + + + $PROJ_DIR$\..\Src\stm32l4xx_hal_msp.c + + + __cstat + 149 + + + ICCARM + 48 + BICOMP - 16 + 69 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 125 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 83 122 129 130 55 68 15 37 92 78 139 73 85 123 104 39 44 159 25 153 99 64 40 127 38 110 52 142 42 166 41 84 47 53 27 48 31 + 171 38 129 91 144 142 107 51 164 90 71 155 76 136 163 84 63 110 118 108 154 172 140 165 37 119 68 125 134 85 130 54 60 87 74 73 33 57 - $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr_ex.c + $PROJ_DIR$\..\Drivers\STM32L4xx_HAL_Driver\Src\stm32l4xx_hal_pwr.c - ICCARM - 126 + __cstat + 170 - __cstat - 141 + ICCARM + 148 BICOMP - 51 + 131 ICCARM - 15 92 123 129 68 127 122 73 37 85 166 41 84 142 42 47 83 130 38 40 139 53 78 104 27 39 44 159 25 110 48 153 55 99 31 64 52 + 71 108 155 129 172 164 165 37 90 118 130 54 60 134 85 87 38 144 110 63 140 74 154 107 73 76 91 136 51 119 33 163 142 171 57 84 68 BICOMP - 44 83 129 99 130 55 104 25 127 37 123 39 159 153 64 40 38 85 92 78 68 139 15 122 73 110 52 142 42 166 41 84 47 53 27 48 31 + 107 38 129 51 164 144 142 91 171 90 155 76 136 163 84 63 110 118 108 154 172 140 71 165 37 119 68 134 85 130 54 60 87 74 73 33 57 + + $PROJ_DIR$\startup_stm32l496xx.s + + + AARM + 40 + + + diff --git a/CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dbgdt b/CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dbgdt index 89f1707..854df73 100644 --- a/CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dbgdt +++ b/CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dbgdt @@ -149,7 +149,7 @@ 14 - 38 + 42 1 @@ -159,11 +159,11 @@ 1 1 1 - 69000000130059840000010000004881000002000000568400000100000010860000260000000F8100000100000020810000070000000C8100000C00000026DE00000100000055840000030000000E840000060000001F810000030000000E8100000D00000028DE0000020000000B810000010000000584000001000000D184000002000000118600000400000010840000020000004681000010000000 + 6A000000130059840000010000004881000002000000568400000100000010860000260000000F8100000100000020810000070000000C8100000C00000026DE00000100000055840000030000000E840000060000001F810000030000000E8100000D00000028DE0000020000000B810000010000000584000001000000D184000002000000118600000400000010840000020000004681000011000000 0F007784000007840000FFFFFFFF808C000044D500005584000056840000598400000D8400000F8400000884000054840000328100001C81000009840000 - 1300048400007E00000031840000850000000F81000055000000208100005D0000000C810000520000000684000080000000038400007D00000030840000830000000E840000810000000E810000540000001F8100005C0000000B81000050000000058400007F000000D18400001F000000028400007C000000328400008600000010840000830000000D810000520000000A84000081000000 + 1300048400007E0000003184000085000000208100005D0000000F810000550000000C810000520000000684000080000000038400007D0000000E8400008100000030840000830000001F8100005C0000000E810000540000000B81000050000000D18400001F000000058400007F000000028400007C000000108400008300000032840000860000000A840000810000000D81000052000000 0 @@ -1059,7 +1059,7 @@ Main - 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000066000000FFFEFF000000000000000000000000000100000001000000018001E100000000000067000000FFFEFF000000000000000000000000000100000001000000018003E100000000000069000000FFFEFF000000000000000000000000000100000001000000018000810000000000004A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006D000000FFFEFF000000000000000000000000000100000001000000018025E100000000000070000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040073000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040074000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005D000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006F000000FFFEFF000000000000000000000000000100000001000000018028E100000000040071000000FFFEFF000000000000000000000000000100000001000000018029E100000000000072000000FFFEFF000000000000000000000000000100000001000000018002810000000000004C000000FFFEFF0000000000000000000000000001000000010000000180298100000000000061000000FFFEFF000000000000000000000000000100000001000000018027810000000000005F000000FFFEFF0000000000000000000000000001000000010000000180288100000000000060000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040059000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000050000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000051000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000065000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005B000000FFFEFF000000000000000000000000000100000001000000018020810000000000005C000000FFFEFF0000000000000000000000000001000000010000000180468100000000020063000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000 + 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000066000000FFFEFF000000000000000000000000000100000001000000018001E100000000000067000000FFFEFF000000000000000000000000000100000001000000018003E100000000000069000000FFFEFF000000000000000000000000000100000001000000018000810000000000004A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006D000000FFFEFF000000000000000000000000000100000001000000018025E100000000000070000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040073000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040074000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005D000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006F000000FFFEFF000000000000000000000000000100000001000000018028E100000000040071000000FFFEFF000000000000000000000000000100000001000000018029E100000000000072000000FFFEFF000000000000000000000000000100000001000000018002810000000000004C000000FFFEFF0000000000000000000000000001000000010000000180298100000000000061000000FFFEFF000000000000000000000000000100000001000000018027810000000000005F000000FFFEFF0000000000000000000000000001000000010000000180288100000000000060000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040059000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000040050000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000051000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000065000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005B000000FFFEFF000000000000000000000000000100000001000000018020810000000000005C000000FFFEFF0000000000000000000000000001000000010000000180468100000000020063000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000 34051 diff --git a/CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dnx b/CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dnx index 3d5d7fa..56dc1c1 100644 --- a/CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dnx +++ b/CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dnx @@ -24,7 +24,7 @@ _ 0 - 3054662682 + 3917700858 D:\Work\CablePositioning\reless\V1.4\FP_IAP_V1.4.out diff --git a/CablePositioning_IAP_V1.0/EWARM/settings/Project.wsdt b/CablePositioning_IAP_V1.0/EWARM/settings/Project.wsdt index 99642f9..2806e19 100644 --- a/CablePositioning_IAP_V1.0/EWARM/settings/Project.wsdt +++ b/CablePositioning_IAP_V1.0/EWARM/settings/Project.wsdt @@ -11,7 +11,7 @@ 20 1867 2 - + 0 -1 @@ -90,11 +90,11 @@ 1 1 1 - BF010000130059840000010000004881000005000000568400000400000010860000010000000F8100000400000020810000010000000C810000B000000026DE00000100000055840000BE0000000E840000060000001F810000010000000E8100003000000028DE0000020000000B810000020000000584000003000000D1840000020000001186000001000000108400000A0000004681000001000000 + C7010000130059840000010000004881000005000000568400000400000010860000010000000F8100000400000020810000010000000C810000B600000026DE00000100000055840000BF0000000E840000060000001F810000010000000E8100003100000028DE0000020000000B810000020000000584000003000000D1840000020000001186000001000000108400000A0000004681000001000000 - 5C007784000007840000FFFFFFFF808C000044D500000D8400000F8400000884000054840000328100001C810000098400001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F000055840000568400005984000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E9200001D9200000C8400003384000078840000118400004881000001000000538400007C8400007D8400007E8400008384000084840000008200001C820000018200006786000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B000002481000008800000098000000A8000000B8000000C800000158000000A81000001E800000484000006840000328400003084000002840000038400000E8400001084000005840000318400000A840000 - 2E00048100001C00000015810000250000002CE1000043000000268100002D000000239200000000000007E100003B00000020810000270000000F8100001F00000004E10000390000005F860000340000000C8100001C0000000D8000001700000001E100003600000023E100003D0000001982000015000000098100001E00000017810000270000004A810000470000001682000013000000008400004800000014810000240000002BE1000042000000449200001000000000810000190000001F810000260000000E8100001E0000001F9200000D00000003E100003800000025E100003F0000002F8200001600000022E100003C0000000B8100001B0000002D9200000F00000000E1000035000000D18400000C00000041E10000450000001882000014000000058100001D00000016810000260000004981000046000000518400005600000005E100003A0000000D8100001D00000002E100003700000035E10000440000002C9200000E000000 + 51007784000007840000FFFFFFFF808C000044D500000D8400000F8400000884000054840000328100001C810000098400001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F000055840000568400005984000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE000020920000289200002992000037920000389200003492000033920000259200001E9200001D9200000C8400003384000078840000118400004881000001000000538400007C8400007D8400007E8400008384000084840000008200001C820000018200006786000001B0000002B0000003B0000004B0000005B0000006B0000007B0000008B0000009B000000AB000000BB000000CB000000DB000000EB0000000B000002481000008800000098000000A8000000B8000000C800000158000000A81000001E80000 + 3900048400004C000000048100001C00000015810000250000002CE1000043000000268100002D000000239200000000000007E100003B0000003184000053000000208100002B0000000F8100002300000004E10000390000005F860000340000000C810000200000000D8000001700000001E100003600000023E100003D0000001982000015000000098100001E000000068400004E00000017810000270000004A810000470000001682000013000000038400004B000000008400004800000014810000240000002BE10000420000004492000010000000008100001900000030840000520000000E840000500000001F8100002A0000000E810000220000001F9200000D00000003E100003800000025E100003F0000002F8200001600000022E100003C0000000B8100001F0000002D9200000F00000000E1000035000000D18400000C00000041E10000450000001882000014000000058400004D000000058100001D00000016810000260000004981000046000000028400004A00000032840000540000001084000051000000518400005600000005E100003A0000000D8100002100000002E100003700000035E10000440000000A8400004F0000002C9200000E000000 0 @@ -355,7 +355,7 @@ Main - 00200000010000002200FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000031000000FFFEFF000000000000000000000000000100000001000000018001E100000000000032000000FFFEFF000000000000000000000000000100000001000000018003E100000000000034000000FFFEFF0000000000000000000000000001000000010000000180008100000000000015000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000000037000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040039000000FFFEFF000000000000000000000000000100000001000000018022E100000000040038000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000004003E000000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF00960000000000000000000180218100000000040028000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003A000000FFFEFF000000000000000000000000000100000001000000018028E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018029E10000000000003D000000FFFEFF0000000000000000000000000001000000010000000180028100000000000017000000FFFEFF000000000000000000000000000100000001000000018029810000000000002C000000FFFEFF000000000000000000000000000100000001000000018027810000000000002A000000FFFEFF000000000000000000000000000100000001000000018028810000000000002B000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040024000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040025000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF0000000000000000000000000001000000010000000180108400000000000051000000FFFEFF0B520065006200750069006C006400200041006C006C00000000000000000000000000010000000100000001800B810000000004001B000000FFFEFF00000000000000000000000000010000000100000001800C810000000000001C000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000030000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000000000001E000000FFFEFF00000000000000000000000000010000000100000001800F810000000000001F000000FFFEFF00000000000000000000000000010000000100000001805584000000000000FFFFFFFFFFFEFF1B44006F0077006E006C006F0061006400200061006300740069007600650020006100700070006C00690063006100740069006F006E00010000000000000001000000000000000100000000000000FFFEFF044D00610069006E004E010000 + 00200000010000002200FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF0000000000000000000000000001000000010000000180108400000000000051000000FFFEFF0B520065006200750069006C006400200041006C006C00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000001805584000000000000FFFFFFFFFFFEFF1B44006F0077006E006C006F0061006400200061006300740069007600650020006100700070006C00690063006100740069006F006E00010000000000000001000000000000000100000000000000FFFEFF044D00610069006E004E010000 34050 @@ -413,7 +413,7 @@ - 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000040000000100000001000000FFFEFF182400570053005F0044004900520024005C002E002E005C005300720063005C0063006F006D006D006F006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003600340039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0863006F006D006D006F006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C002E002E005C005300720063005C006D00610069006E002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300380032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310033003300310036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310033003300310036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF222400570053005F0044004900520024005C002E002E005C005300720063005C00730079007300740065006D005F00730074006D00330032006C003400780078002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00390030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0035003400350038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0035003400350038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF12730079007300740065006D005F00730074006D00330032006C003400780078002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C004300610062006C0065004D006F006E00690074006F0072005F00560033002E0032005C004C006900730074005C004300610062006C0065004D006F006E00690074006F0072005F00560033002E0032002E006D0061007000010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003500390034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF154300610062006C0065004D006F006E00690074006F0072005F00560033002E0032002E006D006100700000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000730100004900000080070000EB020000 + 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000040000000100000001000000FFFEFF182400570053005F0044004900520024005C002E002E005C005300720063005C0063006F006D006D006F006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003600340039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0863006F006D006D006F006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C002E002E005C005300720063005C006D00610069006E002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003100350031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003100350031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF222400570053005F0044004900520024005C002E002E005C005300720063005C00730079007300740065006D005F00730074006D00330032006C003400780078002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00390030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0035003400350038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0035003400350038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF12730079007300740065006D005F00730074006D00330032006C003400780078002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C004300610062006C0065004D006F006E00690074006F0072005F00560033002E0032005C004C006900730074005C004300610062006C0065004D006F006E00690074006F0072005F00560033002E0032002E006D0061007000010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003500390034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF154300610062006C0065004D006F006E00690074006F0072005F00560033002E0032002E006D006100700000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000730100004900000080070000EB020000 diff --git a/CablePositioning_IAP_V1.0/Inc/common.h b/CablePositioning_IAP_V1.0/Inc/common.h index 9a96a41..8e8c6c4 100644 --- a/CablePositioning_IAP_V1.0/Inc/common.h +++ b/CablePositioning_IAP_V1.0/Inc/common.h @@ -42,7 +42,7 @@ /* Define --------------------------------------------------------------------*/ #define VERSION_MAJOR 1 -#define VERSION_MINOR 4 +#define VERSION_MINOR 5 #define COMPILE_TIME (__DATE__" "__TIME__) #define NAME_LEN 32 @@ -182,7 +182,8 @@ typedef struct uint8_t ip_mask[4]; uint8_t ip_gw[4]; uint8_t server_ip[4]; - uint8_t wireless_server_ip[4]; + uint8_t power_type; + uint8_t wireless_server_ip[3]; uint16_t server_port; uint16_t wireless_server_port; /* 版本信息. 224byte */ diff --git a/CablePositioning_IAP_V1.0/Src/common.c b/CablePositioning_IAP_V1.0/Src/common.c index 819cd1f..a47d12c 100644 --- a/CablePositioning_IAP_V1.0/Src/common.c +++ b/CablePositioning_IAP_V1.0/Src/common.c @@ -398,9 +398,6 @@ static HAL_StatusTypeDef _dev_info_default_set(void) memcpy(&dev_info.ip[1], &dev_info.mac[3], 3); dev_info.ip_mask[0] = 255; dev_info.ip_gw[0] = 10; dev_info.ip_gw[3] = 1; - dev_info.wireless_server_ip[0] = 111;dev_info.wireless_server_ip[1] = 47; - dev_info.wireless_server_ip[2] = 21;dev_info.wireless_server_ip[3] = 141; - dev_info.wireless_server_port = 8809; dev_info.server_ip[0] = 111;dev_info.server_ip[1] = 47; dev_info.server_ip[2] = 21;dev_info.server_ip[3] = 141; dev_info.server_port = 8809;