From a90a5297c2b2147076e01019f2ad2f45de82ec96 Mon Sep 17 00:00:00 2001 From: JIU JIALIN <2339061402@qq.com> Date: Mon, 18 Aug 2025 16:41:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=BB=E8=BE=91=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E5=90=8E=E7=BB=9D=E5=AF=B9=E6=A8=A1=E5=BC=8F=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PLSR/PLSR/Core/Src/tim.c | 71 ++-- PLSR/PLSR/EWARM/settings/test.1.dnx | 4 +- PLSR/PLSR/EWARM/test.1.dep | 526 +++++++++++++------------- PLSR/PLSR/EWARM/test.1/Exe/test.1.sim | Bin 37506 -> 37554 bytes 4 files changed, 298 insertions(+), 303 deletions(-) diff --git a/PLSR/PLSR/Core/Src/tim.c b/PLSR/PLSR/Core/Src/tim.c index 7a4bde4..39e98bb 100644 --- a/PLSR/PLSR/Core/Src/tim.c +++ b/PLSR/PLSR/Core/Src/tim.c @@ -1109,7 +1109,16 @@ void Calculate_PluseNum_Simplified(PLSR_RouteConfig_t *route) uint32_t vt = current_section->target_freq; // 目标频率 uint32_t a = route->accel_rate; // 加速度 uint32_t d = route->decel_rate; // 减速度 - uint32_t total_pulses = current_section->target_pulse; // 总脉冲数 + uint32_t total_pulses = 0; + if(route->mode == PLSR_MODE_RELATIVE) + { + total_pulses = current_section->target_pulse; // 总脉冲数 + } + else + { + total_pulses = current_section->target_pulse - route->pulse_count; // 总脉冲数 + } + // 防止除零错误 if (a == 0) a = 1; @@ -1255,7 +1264,15 @@ void Calculate_PluseNum(PLSR_RouteConfig_t *route) uint32_t vf = 0; // 最终频率(必须为0) uint32_t a = route->accel_rate; // 加速度 uint32_t d = route->decel_rate; // 减速度 - uint32_t total_pulses = current_section->target_pulse; // 总脉冲数 + uint32_t total_pulses = 0; + if(route->mode == PLSR_MODE_RELATIVE) + { + total_pulses = current_section->target_pulse; // 总脉冲数 + } + else + { + total_pulses = current_section->target_pulse - route->pulse_count; // 总脉冲数 + } // 防止除零错误 if (a == 0) a = 1; @@ -1673,6 +1690,15 @@ void PLSR_Route_Init(PLSR_RouteConfig_t* route) route->freq_step = 0; // 频率步进值:清零 route->wait_start_tick = 0; // 等待开始时刻:清零 route->act_start_tick = 0; // ACT开始时刻:清零 + + // 初始化模式相关参数 + route->prevPulseCount = 0; // 累积脉冲计数:清零 + route->pulse_count = 0; // 当前脉冲计数:清零 + + // 模式验证:确保mode字段有效 + if (route->mode != PLSR_MODE_RELATIVE && route->mode != PLSR_MODE_ABSOLUTE) { + route->mode = PLSR_MODE_RELATIVE; // 默认使用相对模式 + } PLSR_TIM6_SetUpdateFreq(100); //初始化TIM6更新频率为1000us } @@ -1697,8 +1723,6 @@ void PLSR_Route_Start(PLSR_RouteConfig_t* route) route->route_state = PLSR_ROUTE_RUNNING; // 设置路径状态为运行中 route->current_section_num = route->start_section; // 从起始段开始执行 route->current_freq = route->start_freq; // 设置当前频率为起始频率 - route->pulse_count = 0; // 清零脉冲计数 - route->prevPulseCount = 0; // 清零上一段脉冲计数 route->run_state = PLSR_STATE_IDLE; // 设置运行状态为空闲 // 重置全局脉冲计数器 @@ -1737,9 +1761,6 @@ void PLSR_Route_Stop(PLSR_RouteConfig_t* route) // 重置计数器 __HAL_TIM_SET_COUNTER(&htim2, 0); - // 注意:不重置AllPluse,保持累计脉冲数 - // AllPluse = 0; // 注释掉,避免重复加速问题 - //route->pulse_count = 0; route->prevPulseCount = 0; route->freq_step = 0; @@ -1961,7 +1982,11 @@ void PLSR_Section_SwitchNext(PLSR_RouteConfig_t* route) PLSR_SectionConfig_t* current_section = &route->section[route->current_section_num - 1]; uint8_t next_section_num = current_section->next_section; - route->prevPulseCount += current_section->target_pulse; + // 只在相对模式下累加脉冲计数,绝对模式下不累加 + if (route->mode == PLSR_MODE_RELATIVE) { + route->prevPulseCount += current_section->target_pulse; + } + // 绝对模式下prevPulseCount保持不变,因为每段的target_pulse已经是绝对位置 // 检查下一段是否有效 if (next_section_num-1 == 0 || next_section_num > PLSR_MAX_SECTIONS) { @@ -2137,36 +2162,6 @@ void PLSR_ChackWait_End(PLSR_RouteConfig_t* route) } } -/** - * @brief 检查脉冲是否完成 - * @param route: 路径控制结构体指针 - * @retval 1: 完成, 0: 未完成 - */ -uint8_t PLSR_Section_CheckPulseComplete(PLSR_RouteConfig_t* route) -{ - if (route == NULL) return 0; - - PLSR_SectionConfig_t* current_section = &route->section[route->current_section_num - 1]; - - // 根据等待条件类型检查 - if (current_section->wait_condition.wait_type == PLSR_WAIT_PLUSEEND || - current_section->wait_condition.wait_type == PLSR_WAIT_EXT_OR_END) - { - uint32_t target_pulse; - if (route->mode == PLSR_MODE_RELATIVE) - { - target_pulse = current_section->target_pulse + route->prevPulseCount; //1000 2000 3000 2->3 2000+1000 route->pulse_count>=3000 - } - else - { - target_pulse = current_section->target_pulse; - } - - return (route->pulse_count >= target_pulse) ? 1 : 0; - } - - return 0; -} /** * @brief 获取任务通知标志 diff --git a/PLSR/PLSR/EWARM/settings/test.1.dnx b/PLSR/PLSR/EWARM/settings/test.1.dnx index def6f57..6cc2a2c 100644 --- a/PLSR/PLSR/EWARM/settings/test.1.dnx +++ b/PLSR/PLSR/EWARM/settings/test.1.dnx @@ -12,12 +12,12 @@ 50 - 46232557 - _ 0 _ 0 0 2 + 46232557 + 2012208745 diff --git a/PLSR/PLSR/EWARM/test.1.dep b/PLSR/PLSR/EWARM/test.1.dep index ac43bc6..022f4db 100644 --- a/PLSR/PLSR/EWARM/test.1.dep +++ b/PLSR/PLSR/EWARM/test.1.dep @@ -5,677 +5,677 @@ test.1 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c - $PROJ_DIR$\..\Core\Src\modbus_crc.c - $PROJ_DIR$\..\Core\Src\stm32f4xx_hal_msp.c - $PROJ_DIR$\..\Core\Src\gpio.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sram.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_exti.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c - $PROJ_DIR$\..\Core\Src\flash_save.c - $PROJ_DIR$\..\Core\Src\usart.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c - $PROJ_DIR$\..\Core\Src\system_stm32f4xx.c - $PROJ_DIR$\..\Core\Src\stm32f4xx_hal_timebase_tim.c - $PROJ_DIR$\..\Core\Src\stm32f4xx_it.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c - $PROJ_DIR$\..\Core\Src\main.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_exti.c - $PROJ_DIR$\..\Core\Src\modbus_log.c - $PROJ_DIR$\startup_stm32f407xx.s - $PROJ_DIR$\..\Core\Src\dma.c - $PROJ_DIR$\..\Core\Src\tim.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_crc.c + $PROJ_DIR$\..\Core\Src\system_stm32f4xx.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dma.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rcc.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sram.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_tim.c - $PROJ_DIR$\..\UCOS\Config\app_hooks.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_pwr.c - $PROJ_DIR$\..\UCOS\Ports\os_cpu_c.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c_ex.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_i2c.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_spi.c - $PROJ_DIR$\..\UCOS\Ports\os_cpu_a.asm - $PROJ_DIR$\..\UCOS\Ports\os_dbg.c - $PROJ_DIR$\..\UCOS\Source\ucos_ii.c - $TOOLKIT_DIR$\inc\c\DLib_Defaults.h - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_dma_ex.h + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usart.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c + $PROJ_DIR$\..\Core\Src\usart.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim_ex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dac.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_crc.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c_ex.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rng.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dma.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_exti.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim_ex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_i2c.c $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_gpio.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_pwr.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rcc.c + $PROJ_DIR$\..\Core\Src\stm32f4xx_hal_msp.c + $PROJ_DIR$\..\Core\Src\tim.c + $PROJ_DIR$\startup_stm32f407xx.s + $PROJ_DIR$\..\Core\Src\dma.c + $PROJ_DIR$\..\Core\Src\modbus_crc.c + $PROJ_DIR$\..\Core\Src\main.c + $PROJ_DIR$\..\Core\Src\modbus_log.c + $PROJ_DIR$\..\Core\Src\stm32f4xx_hal_timebase_tim.c + $PROJ_DIR$\..\Core\Src\stm32f4xx_it.c + $PROJ_DIR$\..\Core\Src\flash_save.c + $PROJ_DIR$\..\Core\Src\gpio.c + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_tim_ex.o $TOOLKIT_DIR$\inc\c\stdint.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_i2c_ex.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_dma_ex.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_spi.o + $PROJ_DIR$\..\Core\Inc\stm32f4xx_hal_conf.h $TOOLKIT_DIR$\inc\c\DLib_Product_stdlib.h - $PROJ_DIR$\test.1\Obj\system_stm32f4xx.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_rcc.o + $TOOLKIT_DIR$\inc\c\yvals.h + $PROJ_DIR$\..\UCOS\Source\ucos_ii.h + $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_version.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_dma.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_dma.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_crc.o + $TOOLKIT_DIR$\lib\dl7M_tlf.a + $PROJ_DIR$\..\Core\Inc\flash_save.h $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_usart.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_msp.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_dac.o + $TOOLKIT_DIR$\inc\c\DLib_Defaults.h + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_cortex.h $PROJ_DIR$\..\UCOS\Config\os_cfg.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_i2c_ex.o + $PROJ_DIR$\test.1\Obj\system_stm32f4xx.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_flash_ramfunc.o + $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32F4xx\Include\system_stm32f4xx.h + $PROJ_DIR$\..\Core\Inc\tim.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_msp.o $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_i2c.o - $PROJ_DIR$\..\UCOS\Source\ucos_ii.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal.o - $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_version.h - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_flash_ramfunc.h $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_crc.o $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_timebase_tim.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_tim_ex.o - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_cortex.h - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_dma.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_spi.o - $TOOLKIT_DIR$\inc\c\yvals.h - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_flash_ramfunc.h - $PROJ_DIR$\..\Core\Inc\stm32f4xx_hal_conf.h - $PROJ_DIR$\test.1\Exe\test.1.hex - $TOOLKIT_DIR$\inc\c\stdio.h - $TOOLKIT_DIR$\lib\shb_l.a - $TOOLKIT_DIR$\inc\c\stddef.h - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_pwr_ex.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_uart.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_rcc.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h + $PROJ_DIR$\test.1\Obj\modbus_log.o $TOOLKIT_DIR$\inc\c\DLib_Product.h + $PROJ_DIR$\test.1\Obj\dma.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_gpio.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_pwr.o + $PROJ_DIR$\..\Core\Inc\main.h + $PROJ_DIR$\test.1\Exe\test.1.out + $TOOLKIT_DIR$\inc\c\DLib_Product_string.h + $PROJ_DIR$\test.1\Obj\usart.o $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_dma_ex.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_uart.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_pwr_ex.h + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_tim.h + $TOOLKIT_DIR$\lib\m7M_tls.a + $PROJ_DIR$\test.1\Exe\test.1.hex $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_exti.h - $PROJ_DIR$\..\Core\Inc\main.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_flash_ramfunc.o $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_gpio_ex.h - $PROJ_DIR$\..\UCOS\Source\os_trace.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_dma.o - $PROJ_DIR$\test.1\Obj\tim.o - $PROJ_DIR$\..\UCOS\Config\app_cfg.h - $PROJ_DIR$\..\Core\Inc\tim.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_it.o - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_tim.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_crc.o - $PROJ_DIR$\..\Core\Inc\flash_save.h + $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f407xx.h + $TOOLKIT_DIR$\inc\c\stdlib.h $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_uart.h - $TOOLKIT_DIR$\lib\m7M_tls.a - $TOOLKIT_DIR$\inc\c\DLib_Product_string.h - $PROJ_DIR$\stm32f407xx_flash.icf + $TOOLKIT_DIR$\inc\c\ctype.h + $TOOLKIT_DIR$\lib\shb_l.a + $PROJ_DIR$\..\Core\Inc\usart.h $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_rcc_ex.o + $PROJ_DIR$\..\UCOS\Source\os_trace.h + $PROJ_DIR$\..\UCOS\Config\app_cfg.h $PROJ_DIR$\test.1\Obj\ucos_ii.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_dac.o - $TOOLKIT_DIR$\inc\c\stdlib.h - $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f4xx.h - $TOOLKIT_DIR$\inc\c\ctype.h - $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32F4xx\Include\system_stm32f4xx.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_pwr.o + $PROJ_DIR$\test.1\Obj\tim.o + $TOOLKIT_DIR$\inc\c\stdio.h + $TOOLKIT_DIR$\inc\c\stddef.h + $PROJ_DIR$\stm32f407xx_flash.icf $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_rcc_ex.h - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_flash.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_pwr.o - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_def.h - $PROJ_DIR$\test.1\List\test.1.map - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_cortex.o - $TOOLKIT_DIR$\inc\c\DLib_float_setup.h + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rng.c + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_tim.o + $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_compiler.h + $TOOLKIT_DIR$\inc\c\ysizet.h + $PROJ_DIR$\test.1\Obj\app_hooks.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_i2c.o + $PROJ_DIR$\..\UCOS\Ports\os_cpu_a.asm + $PROJ_DIR$\test.1\Obj\startup_stm32f407xx.o + $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_iccarm.h + $PROJ_DIR$\test.1\Obj\os_dbg.o + $PROJ_DIR$\test.1\Obj\modbus_crc.o + $PROJ_DIR$\..\UCOS\Ports\os_dbg.c + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_exti.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_pwr.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_exti.o + $PROJ_DIR$\..\Core\Inc\modbus_log.h + $PROJ_DIR$\..\UCOS\Config\app_hooks.c + $PROJ_DIR$\test.1\Obj\flash_save.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_spi.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usart.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_flash_ex.h + $PROJ_DIR$\..\UCOS\Ports\os_cpu_c.c + $PROJ_DIR$\..\UCOS\Source\ucos_ii.c + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_usart.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_rcc.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_dma.o + $PROJ_DIR$\test.1\Obj\main.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_tim.c $TOOLKIT_DIR$\lib\rt7M_tl.a - $PROJ_DIR$\..\Drivers\CMSIS\Include\mpu_armv7.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_pwr_ex.o - $TOOLKIT_DIR$\inc\c\math.h - $PROJ_DIR$\..\Drivers\CMSIS\Include\core_cm4.h - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_tim_ex.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_gpio.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_tim.o - $PROJ_DIR$\test.1\Obj\os_cpu_a.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_sram.o + $PROJ_DIR$\..\UCOS\Ports\os_cpu.h $TOOLKIT_DIR$\inc\c\iccarm_builtin.h + $PROJ_DIR$\test.1\List\test.1.map + $TOOLKIT_DIR$\inc\c\math.h $PROJ_DIR$\test.1\Obj\gpio.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_def.h $PROJ_DIR$\..\Core\Inc\modbus_crc.h + $TOOLKIT_DIR$\inc\c\stdarg.h $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_rng.o - $PROJ_DIR$\test.1\Obj\modbus_log.o - $PROJ_DIR$\test.1\Obj\os_cpu_c.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_usart.o + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_tim_ex.h + $TOOLKIT_DIR$\inc\c\DLib_Config_Full.h + $TOOLKIT_DIR$\inc\c\ycheck.h + $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f4xx.h + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_flash.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_pwr_ex.o + $PROJ_DIR$\..\Drivers\CMSIS\Include\core_cm4.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_pwr.o + $PROJ_DIR$\..\Drivers\CMSIS\Include\mpu_armv7.h + $TOOLKIT_DIR$\inc\c\string.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_cortex.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_flash.o $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_flash_ex.o - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_gpio.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_rcc.o - $PROJ_DIR$\test.1\Obj\os_dbg.o + $TOOLKIT_DIR$\inc\c\DLib_float_setup.h $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal.h + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_gpio.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_gpio.o + $PROJ_DIR$\test.1\Obj\os_cpu_c.o $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_wwdg.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_dma.o - $PROJ_DIR$\..\Core\Inc\usart.h - $PROJ_DIR$\test.1\Obj\flash_save.o - $PROJ_DIR$\..\Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f407xx.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_gpio.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_exti.o - $TOOLKIT_DIR$\inc\c\stdarg.h - $TOOLKIT_DIR$\inc\c\ysizet.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_sram.o - $PROJ_DIR$\test.1\Obj\startup_stm32f407xx.o - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_pwr.h - $TOOLKIT_DIR$\lib\dl7M_tlf.a - $PROJ_DIR$\..\Core\Inc\modbus_log.h - $PROJ_DIR$\..\UCOS\Ports\os_cpu.h - $PROJ_DIR$\test.1\Exe\test.1.out - $TOOLKIT_DIR$\inc\c\string.h - $PROJ_DIR$\test.1\Obj\dma.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_flash.o - $TOOLKIT_DIR$\inc\c\ycheck.h - $TOOLKIT_DIR$\inc\c\DLib_Config_Full.h - $PROJ_DIR$\test.1\Obj\modbus_crc.o - $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_compiler.h - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_tim.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_i2c.o - $PROJ_DIR$\test.1\Obj\stm32f4xx_hal_exti.o - $PROJ_DIR$\test.1\Obj\usart.o - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_flash_ex.h - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Inc\stm32f4xx_hal_rcc.h - $PROJ_DIR$\test.1\Obj\main.o - $PROJ_DIR$\test.1\Obj\app_hooks.o - $PROJ_DIR$\..\Drivers\CMSIS\Include\cmsis_iccarm.h + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_rcc.o + $PROJ_DIR$\test.1\Obj\os_cpu_a.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_ll_tim.o + $PROJ_DIR$\test.1\Obj\stm32f4xx_it.o [ROOT_NODE] ILINK - 152 113 + 81 139 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c ICCARM - 155 + 162 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sram.c ICCARM - 132 + 136 - $PROJ_DIR$\..\Core\Src\modbus_crc.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_exti.c ICCARM - 158 + 121 - $PROJ_DIR$\..\Core\Src\stm32f4xx_hal_msp.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c ICCARM - 58 + 65 - $PROJ_DIR$\..\Core\Src\gpio.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c ICCARM - 126 + 54 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_gpio.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash.c ICCARM - 122 + 157 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c ICCARM - 89 + 84 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ramfunc.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_crc.c ICCARM - 86 + 56 - $PROJ_DIR$\..\Core\Src\flash_save.c + $PROJ_DIR$\..\Core\Src\system_stm32f4xx.c ICCARM - 140 + 64 - $PROJ_DIR$\..\Core\Src\usart.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dma.c ICCARM - 163 + 132 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c ICCARM - 66 + 50 - $PROJ_DIR$\..\Core\Src\system_stm32f4xx.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_flash_ex.c ICCARM - 56 + 158 - $PROJ_DIR$\..\Core\Src\stm32f4xx_hal_timebase_tim.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c ICCARM - 67 + 79 - $PROJ_DIR$\..\Core\Src\stm32f4xx_it.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim.c ICCARM - 93 + 108 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_dma_ex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c ICCARM - 83 + 164 - $PROJ_DIR$\..\Core\Src\main.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c ICCARM - 166 + 98 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_exti.c + $PROJ_DIR$\..\Core\Src\usart.c ICCARM - 162 + 83 - $PROJ_DIR$\..\Core\Src\modbus_log.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_crc.c ICCARM - 129 + 71 - $PROJ_DIR$\startup_stm32f407xx.s + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c - AARM - 147 + ICCARM + 151 - $PROJ_DIR$\..\Core\Src\dma.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c ICCARM - 154 + 156 - $PROJ_DIR$\..\Core\Src\tim.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c ICCARM - 90 + 73 - - - ICCARM - 92 85 136 74 165 112 105 141 120 54 156 72 37 157 82 64 159 168 125 117 107 65 78 145 109 133 87 84 70 38 69 110 164 73 148 79 94 121 97 139 76 153 99 106 104 55 144 127 96 150 119 115 62 91 59 151 88 - - - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim_ex.c ICCARM - 63 + 43 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_cortex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c.c ICCARM - 114 + 112 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_wwdg.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c ICCARM - 137 + 130 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dac.c ICCARM - 81 + 60 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rcc.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c_ex.c ICCARM - 134 + 45 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_sram.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c ICCARM - 146 + 85 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_tim.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_exti.c ICCARM - 123 + 119 - $PROJ_DIR$\..\UCOS\Config\app_hooks.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_i2c.c ICCARM - 167 + 69 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_pwr.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_gpio.c ICCARM - 111 + 78 - $PROJ_DIR$\..\UCOS\Ports\os_cpu_c.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_pwr.c ICCARM - 130 + 153 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c_ex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rcc.c ICCARM - 60 + 165 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_i2c.c + $PROJ_DIR$\..\Core\Src\stm32f4xx_hal_msp.c ICCARM - 61 + 68 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_spi.c + $PROJ_DIR$\..\Core\Src\tim.c ICCARM - 71 + 102 + + + ICCARM + 67 80 160 48 131 142 149 92 152 44 148 51 61 147 76 53 109 115 138 154 66 74 104 110 106 161 91 90 55 46 62 150 127 70 120 86 87 146 94 97 103 155 82 95 93 49 144 143 58 122 140 159 52 100 63 137 99 + + - $PROJ_DIR$\..\UCOS\Ports\os_cpu_a.asm + $PROJ_DIR$\startup_stm32f407xx.s AARM - 124 + 114 - $PROJ_DIR$\..\UCOS\Ports\os_dbg.c + $PROJ_DIR$\..\Core\Src\dma.c ICCARM - 135 + 77 - $PROJ_DIR$\..\UCOS\Source\ucos_ii.c + $PROJ_DIR$\..\Core\Src\modbus_crc.c ICCARM - 102 + 117 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr.c + $PROJ_DIR$\..\Core\Src\main.c ICCARM - 108 + 133 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usart.c + $PROJ_DIR$\..\Core\Src\modbus_log.c ICCARM - 57 + 75 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_usart.c + $PROJ_DIR$\..\Core\Src\stm32f4xx_hal_timebase_tim.c ICCARM - 131 + 72 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dac.c + $PROJ_DIR$\..\Core\Src\stm32f4xx_it.c ICCARM - 103 + 168 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_crc.c + $PROJ_DIR$\..\Core\Src\flash_save.c ICCARM - 95 + 124 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_uart.c + $PROJ_DIR$\..\Core\Src\gpio.c ICCARM - 80 + 141 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rng.c + $PROJ_DIR$\test.1\Exe\test.1.out - ICCARM - 128 + ILINK + 139 + + + OBJCOPY + 89 + + + ILINK + 105 111 77 124 141 133 117 75 166 163 116 114 73 156 71 54 84 121 157 158 65 162 112 45 68 79 151 50 98 136 108 43 72 85 130 164 168 56 60 132 119 78 69 153 165 145 47 167 59 64 102 101 83 96 135 88 57 + + - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_rng.c ICCARM - 160 + 145 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_i2c.c + $PROJ_DIR$\..\UCOS\Ports\os_cpu_a.asm - ICCARM - 161 + AARM + 166 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_pwr_ex.c + $PROJ_DIR$\..\UCOS\Ports\os_dbg.c ICCARM - 118 + 116 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_dma.c + $PROJ_DIR$\..\UCOS\Config\app_hooks.c ICCARM - 138 + 111 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_exti.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_spi.c ICCARM - 143 + 47 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_rcc_ex.c + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_usart.c ICCARM - 101 + 59 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_hal_tim_ex.c + $PROJ_DIR$\..\UCOS\Ports\os_cpu_c.c ICCARM - 68 + 163 - $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_gpio.c + $PROJ_DIR$\..\UCOS\Source\ucos_ii.c ICCARM - 142 + 101 - $PROJ_DIR$\test.1\Exe\test.1.out + $PROJ_DIR$\..\Drivers\STM32F4xx_HAL_Driver\Src\stm32f4xx_ll_tim.c - OBJCOPY - 75 - - - ILINK - 113 + ICCARM + 167 - - - ILINK - 100 167 154 140 126 166 158 129 124 130 135 147 63 114 66 89 83 162 155 132 86 122 161 60 58 108 118 81 101 146 160 68 67 80 131 137 93 95 103 138 143 142 61 111 134 128 71 123 57 56 90 102 163 77 116 98 149 - - diff --git a/PLSR/PLSR/EWARM/test.1/Exe/test.1.sim b/PLSR/PLSR/EWARM/test.1/Exe/test.1.sim index 9c8293ffb41e419efeea145a6bd7e506bd37a839..8ea13818aecfc4d0890f8def21519fa7d4b0e6b2 100644 GIT binary patch delta 2876 zcmZ9O3s6+o8OOhKAM9P0$MTTnRk#Zxi{WK7YHUb=2*F2cd{r`_UN!2~X$2b_Nno-I z5?_gW;nWe6IFf17@iA>^R*Y7u8V%Y}GrN*BZ8LV)NgZ`8anYE)>>{_{z3iB_JM+8e zJLlZ*eE)O4bI#tjkC;zBVrreUDi(n8>!bjL00@y<_Z|>;C?NFh0^tmD9q}PIkTH)R zpWkBJ%}Dz#Ebr~=*giGt5qgu3jw?ASc^x1WAVKUa!g3Pwlii&pC*8CggvD5U8Ci;~ zKvpB`I_OL?F)<&z_hNN1miw`sw3{}Otg@46_95qx&ynY``!85tMZCyY$lsCc$PMHs zqN}}wxQ7r-q4AEDaTyx0?IEaS{?578rjL8eNvD&r}h@gN-ly&$n z6KD;MwKs>NdaQk!y+4j}j1DsP$q&L~{Y(GPZ%M>&ekiFgwRc-j=Huu)X$6~a>yP-A zhIB;@5iJGO$!5g=Y;n9HMMg|WG?Mv^K3gJUJr(KuO}m3|E3$cG;?Ca>l>QE zr7_kpoyv{3y%=%$)NuGAQtQzja{u~hEX+adgTSCF-~|6y>X-EQT%Ii<;?-=7@ux^_ zlM(dY$QY}rh0h@SXg*(;;2ee=uxE-)AT_K%CsN8638SH@Xrru4e6i`+op$vh&4IHqIDYEigBc(xI5~+_8uN~Rx8y$wS~Se>?7~c z1oOU(mn`j-Fi`JbUri2+pap9+=mN(gk58RT&zn!$TcX=5nE{`AA%+9vDdoY!2@P33 z^@OXu8b#9s(YZ^W4)@&-w7Poj7;uiNPdp1Pik9`5Pu*0QAh%W~T}zVBr~6bf?T_j* zD-`fvpIV<8BWI??NSxoNzJ&I_(qkm6go~DGmi48xSx!3jt-d?}(IE1;HKXn#zedv$ix!`HkuTaFhr7U0!2$^_IpNcEPq?o$2 zphYXMGGk@RM}Mk+41%9siVroyc3jilmS z>jv4}HB$!BqBt5%ifp9f5T=6lnlTBi!uiczZSrk7F`ezCYV5P*J31|{hv?jBE=jQC$$mZIiL#bdp%DUEBcu=S z)?}t!?d3p}dxl)|Uh`_f+%WFCT8G@f-lx_IMBbQ6r0w&FJS>5%1vgS(LIvrk_Qayt zkMTHi;x=_ICZU}K9yr>oUJ(7j+cafDd-xCoAt$Ey>zxM zr=(+)_pfOjo3kuSQX}q@#@?bq=52kQAh5^vVU02f(I>tukM<3|OW(8olw71=+w9~x z9kxA1-lHX{~S@KE$PDt zRKQ#Fp;xHUg1^#+Zeb1Hn5p32y3zuo!wEDYeSm=bX8LuG+;yMN?&FzstyrgbxN`C9zklHFToylROR(VT)@SOa2{o2|YV7h8i> z{00(n<;Bx(ZBaJEjH`5uOTOU9G55W?W~O#xH9Fv1|JVS+n++iRvmS(M7uJyltsu;9 z1K|zi_!bcEBPs15gpkT@AZ$fu>;U0+J3+X#2m6r#er(-GXwLHStD`zGJQ9t>AaRHl zNko#76eJzVM6wVOxv(C@3vYrr9_g1zu_)9?GA5Po=v8>>vm@|{C=G7VYgE`Me?4(0k{PkxewEmtps33 dOd_dCnEN0FzpO;&mw6cW`8vA1)6TR`{SQmZECT=l delta 2771 zcmZ9O3s6&68ppqLlS^($0wFMa(%y1NDIj)TQ5 zK~cKCxOnUsXLZ%>I;-xeXv(PDX7PcK_0bLBZeMERPS>_;aii@{E&;jw-4N|=GxIy= zJCE<2|M|`%_tYU~!y%@=zO3*Si2imi10V!|i^b&LXIHEkdsIoau)IFF*%Q1l3L316Rx1!6D*My;Ci;V?8>lw zf;CxK8inK{<6By8WMnKvYcW!RypDviR~6=2JAhk>IoUxuGJ5=bXj-vq59a%jgUBJ| z2yzTLiL@c=I?iJ5qx;DfQ=pG?LdMTacp#zA=o%(dZ|esa@iU`QC=VU)eJhjC8$qHnOh_(y)zV}6q(R-e7CsWt7{>~GOR zO}6cL%+DTC6)lQsNuu?d)WrOO!7-Iy9w1ajomwlINPU_t+v=Ft7uZ5VLt|dI=xVJ) zA9*t9b&;lO9gG~I`Pvb-=VA`~qYigtC6DTm`RABJQ*@dhnZpJCztoTDF>RKu_h|^C zWBe{Q#**ly8)9S3q6RjV)YEMC)ua`@kO9s#o(Vypnp!AjbGiGGe6&&4Rd%fIdc=W+ zJM;v7yM?WfdK1AX2tTttFHYJey8v7Tp-b*tveq5vDHi!^jU-evQk=&vf<*I- z$)>}_v$_c1DCa=i1CG9Iw3ZEdzyZ7GU>}g1-*Ds(GWYvPC1f(8%kst&@RS#G-8W@z zD|lKT7@(m9_zflR1i?d4(qIWZ8r7c`nymF-_i-!mb~>Ajsy-#%n~N&D@-Vc5vZ<(| zYZSa1EH0kcrHRge<^c=Lp4PrcA+4mvz>`jbOH|cpV`}12P5d)8wJ|li?$1%xQ!PXq zk6JdMDpd7&)|ZH zhhNqqPn0_3NeAdIQ{J$Sdtx-)=Nm)}w+q9qm)?to`!v00vc~B##2SevB>aTjqc0`o zl54as;dyeLdJ|3)JN;Q=AsJ7PCC(=|DKQt4`*eo6imanY%ooWY=r59-_;@xajhQ0Y zxf%#r`iT#cnF6^@3%uC+$US#$rxG657m#O`yTr?@0&)RI#MO2pygQeOy#k0z_*XQX zR7kq$WJ_-Hhj^W|e3LvIL%&`b83ev|8J%hw{o>yLX{bXpRXmZ48MB+<|u^cYd(-GL8uW{ z3Igy!gn#|%I04x+ghM$8*mL61GEPt*-z-@P55u^uXCX8XM^)88PKsYKhueFV@DOYg z7UH!CHPcU$GwDF`@WlE3>w~WK;9A?MPFhLF4Cx_%qmGoxBa&p`1M+RFUM#H?L~!9{ z!@&L#pVfizi6`TI2R9R-Z>8iBiN2pQjtI0H(>$uNIW0yFaWZ0OC2^h?^ud7K&(M6^ z*o5JDUDfMpepJqmt)sQJjB&dL*x>S-!8M7ZAk_G3+H!lCt*UMaN$!9wF;Wl2pLtji zAL!Xh|6-d$?o!t7#FLY4f6jIakKMUb#5K87m6-3xw*lpyqigK5Qm-h6pjxYm3V&P1 zM>V&+IG6W?JYNmdz;Y!f!qq2p22Hpc+Mk3@%-C556Bz+uE`1dAi9ltvf&2{?_VfVH;XeKO#y^`FkTQYBoYJo-wi2mZ!-;9ZyloiVhN*u6ti z?`TQb`(3(^WlX*FR8~LPM^B7wCl$0hJDt2lo3qD}o8I>9>lU(&Zhaw>b>a8SB(L{{ zH3n0t89018xsK()mwG3Z{5!#9$0B}z@ECJ`n|Iv8bcXq7p?BV*kF})Ho4%xusgD!` zw+nk6eG|Aj)xaHJ0$hq4%Sc88a6>l$_ad@+BXAdx`^dFM;4DqR{S=A+HE?UU0O!HU zFCgdeL+1k0fm}weBG-@`$j68u=|XNHe{X@w+^1-Kj@(A>B0=OI$d|}{s{wPA$>@)j5{%AuPEd(aLHx@5O1`Q(xlnnrQl}`&rHh#E@#FV+Pu@r HY)SktK9dKT