Browse Source

解决一些bug

2
JIU JIALIN 1 month ago
parent
commit
18e39837c5
4 changed files with 453 additions and 456 deletions
  1. +4
    -7
      PLSR/PLSR/Core/Src/tim.c
  2. +2
    -2
      PLSR/PLSR/EWARM/settings/test.1.dnx
  3. +447
    -447
      PLSR/PLSR/EWARM/test.1.dep
  4. BIN
      PLSR/PLSR/EWARM/test.1/Exe/test.1.sim

+ 4
- 7
PLSR/PLSR/Core/Src/tim.c View File

@@ -912,11 +912,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
PLSR_Route_PWM_Stop(); PLSR_Route_PWM_Stop();
} }
else PLSR_Section_PWM_Stop(); else PLSR_Section_PWM_Stop();
if(PlsrRoute.part1_target_freq == PlsrRoute.section[PlsrRoute.current_section_num - 1].target_freq
&& PlsrRoute.current_part == 1)
{
PlsrRoute.current_freq = PlsrRoute.target_freq;
}

// 精确累加当前段已发送的脉冲数 // 精确累加当前段已发送的脉冲数
int32_t current_section_pulses = __HAL_TIM_GetAutoreload(&htim2); int32_t current_section_pulses = __HAL_TIM_GetAutoreload(&htim2);
if(PlsrModFlag == 1) if(PlsrModFlag == 1)
@@ -943,6 +939,9 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
PlsrRoute.initial_freq = PlsrRoute.part2_target_freq; // 更新加减速初始频率 PlsrRoute.initial_freq = PlsrRoute.part2_target_freq; // 更新加减速初始频率


PlsrRoute.current_freq = PlsrRoute.target_freq; PlsrRoute.current_freq = PlsrRoute.target_freq;
if(PlsrRoute.current_freq > 90000)
;
else
PLSR_PWM_SetFrequency(PlsrRoute.current_freq); PLSR_PWM_SetFrequency(PlsrRoute.current_freq);
// if(PlsrRoute.current_freq >= 90000) // if(PlsrRoute.current_freq >= 90000)
// HAL_TIM_GenerateEvent(&htim10, TIM_EVENTSOURCE_UPDATE); // HAL_TIM_GenerateEvent(&htim10, TIM_EVENTSOURCE_UPDATE);
@@ -1728,8 +1727,6 @@ void PLSR_Section_SwitchNext(PLSR_RouteConfig_t* route, uint8_t is_pulse_complet
// 清除新段的外部事件标志,确保每段都是干净的状态 // 清除新段的外部事件标志,确保每段都是干净的状态
PLSR_ClearExtEvent(route); PLSR_ClearExtEvent(route);
route->initial_freq = route->current_freq; route->initial_freq = route->current_freq;
// 外部事件触发时保持当前频率不变,确保频率连续性
} }






+ 2
- 2
PLSR/PLSR/EWARM/settings/test.1.dnx View File

@@ -12,12 +12,12 @@
<ByteLimit>50</ByteLimit> <ByteLimit>50</ByteLimit>
</Stack> </Stack>
<StLinkDriver> <StLinkDriver>
<stlinkserialNo>46232557</stlinkserialNo>
<stlinkfoundProbes />
<CStepIntDis>_ 0</CStepIntDis> <CStepIntDis>_ 0</CStepIntDis>
<LeaveTargetRunning>_ 0</LeaveTargetRunning> <LeaveTargetRunning>_ 0</LeaveTargetRunning>
<stlinkResetStyle>0</stlinkResetStyle> <stlinkResetStyle>0</stlinkResetStyle>
<stlinkResetStrategy>2</stlinkResetStrategy> <stlinkResetStrategy>2</stlinkResetStrategy>
<stlinkserialNo>46232557</stlinkserialNo>
<stlinkfoundProbes />
</StLinkDriver> </StLinkDriver>
<DebugChecksum> <DebugChecksum>
<Checksum>630028761</Checksum> <Checksum>630028761</Checksum>


+ 447
- 447
PLSR/PLSR/EWARM/test.1.dep
File diff suppressed because it is too large
View File


BIN
PLSR/PLSR/EWARM/test.1/Exe/test.1.sim View File


Loading…
Cancel
Save