Запущена симуляция переструктурированного проекта
This commit is contained in:
@@ -31,7 +31,7 @@ void GPIO_to_SFUNC(real_T* out_buff)
|
||||
out_buff[PORT_WIDTH + i] = 1;
|
||||
}
|
||||
|
||||
if (GPIOE->ODR & (1 << i))
|
||||
if (GPIOA->ODR & (1 << i))
|
||||
{
|
||||
out_buff[2*PORT_WIDTH + i] = 1;
|
||||
}
|
||||
@@ -50,12 +50,12 @@ void SFUNC_to_GPIO(real_T* in)
|
||||
{
|
||||
int i = 0;
|
||||
// write pwm ctrl registers
|
||||
for (i = 0; i < 5; i++)
|
||||
for (i = 0; i < 6; i++)
|
||||
{
|
||||
pwm_ctrl[i] = in[i];
|
||||
}
|
||||
// write pwm ctrl coils
|
||||
if (in[5] > 0.5)
|
||||
if (in[i++] > 0.5)
|
||||
{
|
||||
MB_Set_Coil_Local(coils_regs, COIL_PWM_DC_MODE);
|
||||
}
|
||||
@@ -63,7 +63,7 @@ void SFUNC_to_GPIO(real_T* in)
|
||||
{
|
||||
MB_Reset_Coil_Local(coils_regs, COIL_PWM_DC_MODE);
|
||||
}
|
||||
if (in[6] > 0.5)
|
||||
if (in[i++] > 0.5)
|
||||
{
|
||||
MB_Set_Coil_Local(coils_regs, COIL_PWM_BRIDGE_MODE);
|
||||
}
|
||||
@@ -71,7 +71,7 @@ void SFUNC_to_GPIO(real_T* in)
|
||||
{
|
||||
MB_Reset_Coil_Local(coils_regs, COIL_PWM_BRIDGE_MODE);
|
||||
}
|
||||
if (in[7] > 0.5)
|
||||
if (in[i++] > 0.5)
|
||||
{
|
||||
MB_Set_Coil_Local(coils_regs, COIL_PWM_PHASE_MODE);
|
||||
}
|
||||
|
||||
@@ -25,11 +25,11 @@
|
||||
//#define AHB_Prescaler ((RCC->PLLCFGR & RCC_PLLCFGR_PLLN) >> RCC_PLLCFGR_PLLN_Pos)
|
||||
//#define AHB_Prescaler ((RCC->CFGR & RCC_CFGR_HPRE) >> RCC_CFGR_HPRE_Pos)
|
||||
|
||||
#define HCLK_Value (double)72000000;
|
||||
#define ABP1_Value (double)72000000;
|
||||
#define ABP1_TIMS_Value (double)72000000;
|
||||
#define ABP2_Value (double)72000000;
|
||||
#define ABP2_TIMS_Value (double)72000000;
|
||||
#define HCLK_Value (double)168000000;
|
||||
#define ABP1_Value (double)42000000;
|
||||
#define ABP1_TIMS_Value (double)84000000;
|
||||
#define ABP2_Value (double)42000000;
|
||||
#define ABP2_TIMS_Value (double)84000000;
|
||||
|
||||
/* Эти дефайны добавлены в код stm32f4xx_hal_rcc.c, чтобы не попасть в бесконечный цикл */
|
||||
/* Мб перенести в MCU_Periph_Simulation(), но чет не хочется нагружать симуляцию этой херней */
|
||||
|
||||
@@ -126,11 +126,11 @@ void Init_TIM_SIM(void)
|
||||
tim2s.tx_step = hmcu.SIM_Sample_Time * ABP1_TIMS_Value;
|
||||
|
||||
tim2s.Channels.OC1_GPIOx = GPIOA;
|
||||
tim2s.Channels.OC1_PIN_SHIFT = 5;
|
||||
tim2s.Channels.OC2_GPIOx = GPIOA;
|
||||
tim2s.Channels.OC2_PIN_SHIFT = 1;
|
||||
tim2s.Channels.OC3_GPIOx = GPIOA;
|
||||
tim2s.Channels.OC3_PIN_SHIFT = 2;
|
||||
tim2s.Channels.OC1_PIN_SHIFT = 15;
|
||||
tim2s.Channels.OC2_GPIOx = GPIOE;
|
||||
tim2s.Channels.OC2_PIN_SHIFT = 11;
|
||||
tim2s.Channels.OC3_GPIOx = GPIOE;
|
||||
tim2s.Channels.OC3_PIN_SHIFT = 13;
|
||||
tim2s.Channels.OC4_GPIOx = GPIOA;
|
||||
tim2s.Channels.OC4_PIN_SHIFT = 3;
|
||||
tim2s.Channels.OC1REF = 0;
|
||||
|
||||
@@ -45,8 +45,8 @@
|
||||
|
||||
// DEFINES (UNCOMMENT WHAT YOU WILL SIMULATE)
|
||||
// TIMS
|
||||
#define USE_TIM1
|
||||
//#define USE_TIM2
|
||||
//#define USE_TIM1
|
||||
#define USE_TIM2
|
||||
#define USE_TIM3
|
||||
#define USE_TIM4
|
||||
//#define USE_TIM5
|
||||
@@ -56,8 +56,8 @@
|
||||
//#define USE_TIM9
|
||||
//#define USE_TIM10
|
||||
//#define USE_TIM11
|
||||
#define USE_TIM12
|
||||
//#define USE_TIM13
|
||||
//#define USE_TIM12
|
||||
#define USE_TIM13
|
||||
//#define USE_TIM14
|
||||
|
||||
// TIM'S HANDLERS
|
||||
|
||||
Reference in New Issue
Block a user