Merge branch 'NewPWM_Matlab' of https://git.arktika.cyou/set506/matlab_stm_emulate into NewPWM_Matlab
This commit is contained in:
commit
d464506c32
@ -70,7 +70,7 @@ void Periph_reInit(void)
|
||||
|
||||
// if (sin3Phase)
|
||||
// coils_regs[0]=0xc;
|
||||
//////////////вкл/выкл 74AC08//////////
|
||||
//////////////âêë/âûêë 74AC08//////////
|
||||
if ((GPIOC->IDR & (1 << 1)) == 0)
|
||||
GPIOC->ODR &= ~(1 << 0);
|
||||
else
|
||||
@ -99,10 +99,10 @@ void Periph_reInit(void)
|
||||
}
|
||||
|
||||
// READ TIM_PWM_HZ
|
||||
if (hpwm_a.stim.sTimFreqHz != pwm_ctrl[R_PWM_CTRL_PWM_HZ])
|
||||
if (hpwm.tim_a.stim.sTimFreqHz != pwm_ctrl[R_PWM_CTRL_PWM_HZ])
|
||||
{
|
||||
hpwm_a.stim.sTimFreqHz = pwm_ctrl[R_PWM_CTRL_PWM_HZ];
|
||||
pwm_ctrl[R_PWM_CTRL_PWM_HZ] = hpwm_a.stim.sTimFreqHz;
|
||||
hpwm.tim_a.stim.sTimFreqHz = pwm_ctrl[R_PWM_CTRL_PWM_HZ];
|
||||
pwm_ctrl[R_PWM_CTRL_PWM_HZ] = hpwm.tim_a.stim.sTimFreqHz;
|
||||
|
||||
// update tim
|
||||
UpdatePWMTIM = 1;
|
||||
@ -112,13 +112,13 @@ void Periph_reInit(void)
|
||||
|
||||
|
||||
// READ TICKBASE_PRESCALER
|
||||
if (hpwm_a.stim.sTickBasePrescaler != pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER])
|
||||
if (hpwm.tim_a.stim.sTickBasePrescaler != pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER])
|
||||
{
|
||||
if ((hpwm_a.stim.sTickBasePrescaler > 1) ||
|
||||
if ((hpwm.tim_a.stim.sTickBasePrescaler > 1) ||
|
||||
(pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER] > 1))
|
||||
{
|
||||
hpwm_a.stim.sTickBasePrescaler = pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER];
|
||||
pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER] = hpwm_a.stim.sTickBasePrescaler;
|
||||
hpwm.tim_a.stim.sTickBasePrescaler = pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER];
|
||||
pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER] = hpwm.tim_a.stim.sTickBasePrescaler;
|
||||
|
||||
// update tim
|
||||
UpdatePWMTIM = 1;
|
||||
@ -138,14 +138,15 @@ void Periph_reInit(void)
|
||||
if (UpdatePWMTIM)
|
||||
{
|
||||
// reinit tims
|
||||
PWM_Sine_ReInit(&hpwm_a);
|
||||
PWM_Sine_ReInit(&hpwm);
|
||||
|
||||
// UPDATE DUTY TABLE SCALE
|
||||
PWM_Update_Params(&hpwm_a);
|
||||
PWM_Update_Params(&hpwm);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* USER CODE END 0 */
|
||||
|
||||
/**
|
||||
|
||||
Loading…
Reference in New Issue
Block a user