Razvalyaev/UPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

моделирование чет непонятное

Browse Source
This commit is contained in:
Razvalyaev
2025-11-21 00:30:07 +03:00
parent d918ffb860
commit b21d72b728
18 changed files with 99 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MATLAB/MCU_STM32_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h
View File

@@ -1247,7 +1247,7 @@ typedef void (*pTIM_CallbackTypeDef)(TIM_HandleTypeDef *htim); /*!< pointer to
* @arg TIM_IT_BREAK: Break interrupt
* @retval None
*/
#define __HAL_TIM_CLEAR_IT(__HANDLE__, __INTERRUPT__) ((__HANDLE__)->Instance->SR = ~(__INTERRUPT__))
#define __HAL_TIM_CLEAR_IT(__HANDLE__, __INTERRUPT__) ((__HANDLE__)->Instance->SR &= ~(__INTERRUPT__))
/**
* @brief Indicates whether or not the TIM Counter is used as downcounter.

2
MATLAB/MCU_STM32_Matlab/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h
View File

@@ -1254,7 +1254,7 @@ typedef void (*pTIM_CallbackTypeDef)(TIM_HandleTypeDef *htim); /*!< pointer to
* @arg TIM_IT_BREAK: Break interrupt
* @retval None
*/
#define __HAL_TIM_CLEAR_IT(__HANDLE__, __INTERRUPT__) ((__HANDLE__)->Instance->SR = ~(__INTERRUPT__))
#define __HAL_TIM_CLEAR_IT(__HANDLE__, __INTERRUPT__) ((__HANDLE__)->Instance->SR &= ~(__INTERRUPT__))
/**
* @brief Indicates whether or not the TIM Counter is used as downcounter.

54
MATLAB/MCU_STM32_Matlab/Drivers/STM32_SIMULINK/stm32_matlab_tim.c
View File

@@ -13,10 +13,14 @@ void TIM_Call_IRQHandller(TIM_TypeDef* TIMx);
/* Базовая функция для симуляции таймера: она вызывается каждый шаг симуляции */
void TIM_Simulation(TIM_TypeDef *TIMx, struct TIM_Sim *TIMS)
{
if (!(TIMx->CR1 & TIM_CR1_CEN)) // таймер не включен - возврат
{
TIMS->RepititiveCnt = 0;
return;
}
Overflow_Check(TIMx, TIMS);
// Выбор режима работы таймера
switch (TIMx->SMCR & TIM_SMCR_SMS) // TIMER MODE
{
@@ -50,9 +54,9 @@ void TIM_Simulation(TIM_TypeDef *TIMx, struct TIM_Sim *TIMS)
/* Счет таймера за один такт */
void TIMx_Count(TIM_TypeDef* TIMx, struct TIM_Sim* TIMS)
{
if ((TIMx->CR1 & TIM_CR1_DIR) && TIMx->CR1) // up COUNTER and COUNTER ENABLE
if ((TIMx->CR1 & TIM_CR1_DIR)) // up COUNTER ENABLE
TIMS->tx_cnt -= TIMS->tx_step / (TIMx->PSC + 1);
else if (((TIMx->CR1 & TIM_CR1_DIR) == 0) && TIMx->CR1) // down COUNTER and COUNTER ENABLE
else if (((TIMx->CR1 & TIM_CR1_DIR) == 0)) // down COUNTER ENABLE
TIMS->tx_cnt += TIMS->tx_step / (TIMx->PSC + 1);
TIMx->CNT = (uint32_t)TIMS->tx_cnt;
}
@@ -66,20 +70,40 @@ void Overflow_Check(TIM_TypeDef* TIMx, struct TIM_Sim* TIMS)
if ((TIMx->CR1 & TIM_CR1_ARPE) == 0) TIMS->RELOAD = TIMx->ARR; // PRELOAD disable - update ARR every itteration
if (TIMS->tx_cnt > TIMS->RELOAD || TIMS->tx_cnt < 0) // OVERFLOW
{
TIMS->RELOAD = TIMx->ARR; // RELOAD ARR
if (TIMS->tx_cnt > TIMx->ARR) // reset COUNTER
TIMS->tx_cnt -= TIMS->RELOAD + 1;
else if (TIMS->tx_cnt < 0)
TIMS->tx_cnt += TIMS->RELOAD + 1;
if (TIMS->tx_step > TIMS->RELOAD)
TIMS->tx_cnt = 0;
if (!(TIMx->CR1 & TIM_CR1_OPM)) // if no one pulse
{
TIMS->Updated = 1;
TIMS->RELOAD = TIMx->ARR; // RELOAD ARR
if (TIMS->tx_cnt > TIMx->ARR) // reset COUNTER
TIMS->tx_cnt -= TIMS->RELOAD+1;
else if (TIMS->tx_cnt < 0)
TIMS->tx_cnt += TIMS->RELOAD+1;
if(TIMS->tx_step > TIMS->RELOAD)
TIMS->tx_cnt = 0;
if (TIMx->DIER & TIM_DIER_UIE) {
TIMx->SR |= TIM_SR_UIF;
TIMx->SR |= TIM_SR_UIF;
}
}
else // if one pulse mode enabled
{
if (TIMS->RepititiveCnt >= TIMx->RCR)
{
TIMS->RepititiveCnt = 0;
TIMS->Updated = 1;
TIMx->CR1 &= ~TIM_CR1_CEN;
if (TIMx->DIER & TIM_DIER_UIE) {
TIMx->SR |= TIM_SR_UIF;
}
}
else
{
TIMS->RepititiveCnt++;
}
}
}
}
}

1
MATLAB/MCU_STM32_Matlab/Drivers/STM32_SIMULINK/stm32_matlab_tim.h
View File

@@ -73,6 +73,7 @@ struct TIM_Sim
double tx_cnt; // счетчик таймера
double tx_step; // шаг счета за один шаг симуляции
long long RELOAD; // буфер, если PRELOAD = 1
long long RepititiveCnt; // буфер, если PRELOAD = 1
struct Channels_Sim Channels; // структура для симуляции каналов
};
/////////////////////////////////////////////////////////////////////

8
MATLAB/MCU_STM32_Matlab/stm32_matlab_conf.c
View File

@@ -217,10 +217,10 @@ void Init_TIM_SIM(void)
tim8s.Channels.OC1_PIN_SHIFT = 0;
tim8s.Channels.OC2_GPIOx = GPIOA;
tim8s.Channels.OC2_PIN_SHIFT = 0;
tim8s.Channels.OC3_GPIOx = GPIOA;
tim8s.Channels.OC3_PIN_SHIFT = 0;
tim8s.Channels.OC4_GPIOx = GPIOA;
tim8s.Channels.OC4_PIN_SHIFT = 0;
tim8s.Channels.OC3_GPIOx = GPIOC;
tim8s.Channels.OC3_PIN_SHIFT = 8;
tim8s.Channels.OC4_GPIOx = GPIOC;
tim8s.Channels.OC4_PIN_SHIFT = 9;
#endif
#ifdef USE_TIM9
memset(&tim9s, 0, sizeof(tim9s));

5
MATLAB/app_wrapper/app_init.c
View File

@@ -18,14 +18,15 @@ void app_init(void) {
// если не используется отдельный поток для main().
HAL_Init();
MX_DMA_Init();
MX_IWDG_Init();
MX_TIM1_Init();
MX_TIM2_Init();
MX_TIM3_Init();
MX_TIM8_Init();
MX_TIM5_Init();
MX_ADC3_Init();
UPP_SetDefault(1, 1);
UPP_Init();
UPP_Params_SetDefault(1, 1);
UPP_App_Init();
UPP_PreWhile();
UPP_DO.CEN(DISABLE);

6
MATLAB/app_wrapper/app_io.c
View File

@@ -92,7 +92,7 @@ void Write_AngleControl(real_T* Buffer, int ind_port)
int nn = 0;
WriteOutputArray(upp.hangle.Iref, ind_port, nn++);
WriteOutputArray(upp.pm.measured.final.Iamp, ind_port, nn++);
WriteOutputArray(upp.hangle.Imeas, ind_port, nn++);
WriteOutputArray(upp.hangle.alpha, ind_port, nn++);
@@ -125,8 +125,8 @@ void app_readInputs(const real_T* Buffer) {
MB_INTERNAL.param.angle.PID_Kd = ReadInputArray(1, 6) * 10000;
MB_INTERNAL.param.angle.PID_ExpAlpha = ReadInputArray(1, 7) * 65535;
MB_INTERNAL.param.nominal.U = ReadInputArray(1, 8) * 10000;
MB_INTERNAL.param.nominal.I = ReadInputArray(1, 9) * 65535;
MB_INTERNAL.param.nominal.U = ReadInputArray(1, 8) * 10;
MB_INTERNAL.param.nominal.I = ReadInputArray(1, 9) * 10;
// USER APP INPUT END
}

7
MATLAB/app_wrapper/app_wrapper.c
View File

@@ -9,6 +9,13 @@
void app_step(void)
{
// USER APP STEP START
static int first_step = 0;
if(first_step == 0)
{
first_step = 1;
UPP_DO.CEN(ENABLE);
}
UPP_While();

1
MATLAB/upp_init.m
View File

@@ -2,6 +2,7 @@ clear all
Ts = 5e-6;
Vnom = 400;
Inom = 30;
Fnom = 50;
Temperature1 = 2.22; % 20 градусов

BIN
MATLAB/upp_r2023.slx
View File

Binary file not shown.

BIN
MATLAB/upp_r2023.slx.original Normal file
View File

Binary file not shown.