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 9c8293f..8ea1381 100644 Binary files a/PLSR/PLSR/EWARM/test.1/Exe/test.1.sim and b/PLSR/PLSR/EWARM/test.1/Exe/test.1.sim differ