подправлен main.c под новую структуру проекта
This commit is contained in:
parent
8c6e7fd7f1
commit
8d7afff1c3
@ -70,7 +70,7 @@ void Periph_reInit(void)
|
|||||||
|
|
||||||
// if (sin3Phase)
|
// if (sin3Phase)
|
||||||
// coils_regs[0]=0xc;
|
// coils_regs[0]=0xc;
|
||||||
//////////////вкл/выкл 74AC08//////////
|
//////////////âêë/âûêë 74AC08//////////
|
||||||
if ((GPIOC->IDR & (1 << 1)) == 0)
|
if ((GPIOC->IDR & (1 << 1)) == 0)
|
||||||
GPIOC->ODR &= ~(1 << 0);
|
GPIOC->ODR &= ~(1 << 0);
|
||||||
else
|
else
|
||||||
@ -99,10 +99,10 @@ void Periph_reInit(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// READ TIM_PWM_HZ
|
// 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];
|
hpwm.tim_a.stim.sTimFreqHz = pwm_ctrl[R_PWM_CTRL_PWM_HZ];
|
||||||
pwm_ctrl[R_PWM_CTRL_PWM_HZ] = hpwm_a.stim.sTimFreqHz;
|
pwm_ctrl[R_PWM_CTRL_PWM_HZ] = hpwm.tim_a.stim.sTimFreqHz;
|
||||||
|
|
||||||
// update tim
|
// update tim
|
||||||
UpdatePWMTIM = 1;
|
UpdatePWMTIM = 1;
|
||||||
@ -112,13 +112,13 @@ void Periph_reInit(void)
|
|||||||
|
|
||||||
|
|
||||||
// READ TICKBASE_PRESCALER
|
// 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))
|
(pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER] > 1))
|
||||||
{
|
{
|
||||||
hpwm_a.stim.sTickBasePrescaler = pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER];
|
hpwm.tim_a.stim.sTickBasePrescaler = pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER];
|
||||||
pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER] = hpwm_a.stim.sTickBasePrescaler;
|
pwm_ctrl[R_PWM_CTRL_TICKBASE_PRESCALER] = hpwm.tim_a.stim.sTickBasePrescaler;
|
||||||
|
|
||||||
// update tim
|
// update tim
|
||||||
UpdatePWMTIM = 1;
|
UpdatePWMTIM = 1;
|
||||||
@ -138,14 +138,15 @@ void Periph_reInit(void)
|
|||||||
if (UpdatePWMTIM)
|
if (UpdatePWMTIM)
|
||||||
{
|
{
|
||||||
// reinit tims
|
// reinit tims
|
||||||
PWM_Sine_ReInit(&hpwm_a);
|
PWM_Sine_ReInit(&hpwm);
|
||||||
|
|
||||||
// UPDATE DUTY TABLE SCALE
|
// UPDATE DUTY TABLE SCALE
|
||||||
PWM_Update_Params(&hpwm_a);
|
PWM_Update_Params(&hpwm);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* USER CODE END 0 */
|
/* USER CODE END 0 */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user