diff --git a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json index 5a3525a..aafe69e 100644 --- a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json +++ b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json @@ -67,13 +67,13 @@ "Tab_TIM_Enable": { "Prompt": "Enable TIMs", "Type": "checkbox", - "Default": true, + "Default": false, "NewRow": true }, "Tab_ADC_Enable": { "Prompt": "Enable ADCs", "Type": "checkbox", - "Default": true, + "Default": false, "NewRow": true } } @@ -106,8 +106,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cryp.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_CAN": { "Prompt": "Enable HAL CAN Module", @@ -115,8 +114,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_CAN_LEGACY": { "Prompt": "Enable HAL CAN_LEGACY Module", @@ -124,8 +122,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can_legacy.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_CEC": { "Prompt": "Enable HAL CEC Module", @@ -133,8 +130,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_CORTEX": { "Prompt": "Enable HAL CORTEX Module", @@ -142,8 +138,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c" ], "Type": "checkbox", - "Default": true, - "NewRow": false + "Default": true }, "HAL_CRC": { "Prompt": "Enable HAL CRC Module", @@ -151,8 +146,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_DAC": { "Prompt": "Enable HAL DAC Module", @@ -161,8 +155,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_DMA": { "Prompt": "Enable HAL DMA Module", @@ -170,8 +163,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_ETH": { "Prompt": "Enable HAL ETH Module", @@ -179,8 +171,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_FLASH": { "Prompt": "Enable HAL FLASH Module", @@ -189,8 +180,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_EXTI": { "Prompt": "Enable HAL EXTI Module", @@ -198,8 +188,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c" ], "Type": "checkbox", - "Default": true, - "NewRow": false + "Default": true }, "HAL_GPIO": { "Prompt": "Enable HAL GPIO Module", @@ -208,8 +197,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c" ], "Type": "checkbox", - "Default": true, - "NewRow": true + "Default": true }, "HAL_I2C": { "Prompt": "Enable HAL I2C Module", @@ -217,8 +205,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_I2S": { "Prompt": "Enable HAL I2S Module", @@ -226,8 +213,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_IRDA": { "Prompt": "Enable HAL IRDA Module", @@ -235,8 +221,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_IWDG": { "Prompt": "Enable HAL IWDG Module", @@ -244,8 +229,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_NOR": { "Prompt": "Enable HAL NOR Module", @@ -253,8 +237,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_NAND": { "Prompt": "Enable HAL NAND Module", @@ -262,8 +245,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_PCCARD": { "Prompt": "Enable HAL PCCARD Module", @@ -271,8 +253,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_PCD": { "Prompt": "Enable HAL PCD Module", @@ -281,8 +262,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_HCD": { "Prompt": "Enable HAL HCD Module", @@ -290,8 +270,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_PWR": { "Prompt": "Enable HAL PWR Module", @@ -299,8 +278,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c" ], "Type": "checkbox", - "Default": true, - "NewRow": false + "Default": true }, "HAL_RCC": { "Prompt": "Enable HAL RCC Module", @@ -309,8 +287,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c" ], "Type": "checkbox", - "Default": true, - "NewRow": false + "Default": true }, "HAL_RTC": { "Prompt": "Enable HAL RTC Module", @@ -319,8 +296,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_SD": { "Prompt": "Enable HAL SD Module", @@ -328,8 +304,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_MMC": { "Prompt": "Enable HAL MMC Module", @@ -337,8 +312,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_SDRAM": { "Prompt": "Enable HAL SDRAM Module", @@ -346,8 +320,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sdram.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_SMARTCARD": { "Prompt": "Enable HAL SMARTCARD Module", @@ -355,8 +328,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_SPI": { "Prompt": "Enable HAL SPI Module", @@ -364,8 +336,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_SRAM": { "Prompt": "Enable HAL SRAM Module", @@ -373,8 +344,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_TIM": { "Prompt": "Enable HAL TIM Module", @@ -383,8 +353,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c" ], "Type": "checkbox", - "Default": true, - "NewRow": false + "Default": true }, "HAL_UART": { "Prompt": "Enable HAL UART Module", @@ -392,8 +361,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false }, "HAL_USART": { "Prompt": "Enable HAL USART Module", @@ -401,8 +369,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c" ], "Type": "checkbox", - "Default": false, - "NewRow": true + "Default": false }, "HAL_WWDG": { "Prompt": "Enable HAL WWDG Module", @@ -410,8 +377,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c" ], "Type": "checkbox", - "Default": false, - "NewRow": false + "Default": false } } }, @@ -421,36 +387,31 @@ "Prompt": "HCLK Clock (Hz)", "Def": "HCLK_Value", "Type": "edit", - "Default": 7.2E+7, - "NewRow": true + "Default": 7.2E+7 }, "ABP1_Clock": { "Prompt": "ABP1 Clock (Hz)", "Def": "ABP1_Value", "Type": "edit", - "Default": 7.2E+7, - "NewRow": true + "Default": 7.2E+7 }, "ABP1_TIMS_Clock": { "Prompt": "ABP1 Tim's Clock (Hz)", "Def": "ABP1_TIMS_Value", "Type": "edit", - "Default": 7.2E+7, - "NewRow": true + "Default": 7.2E+7 }, "ABP2_Clock": { "Prompt": "ABP2 Clock (Hz)", "Def": "ABP2_Value", "Type": "edit", - "Default": 7.2E+7, - "NewRow": true + "Default": 7.2E+7 }, "ABP2_TIMS_Clock": { "Prompt": "ABP2 Tim's Clock (Hz)", "Def": "ABP2_TIMS_Value", "Type": "edit", - "Default": 7.2E+7, - "NewRow": true + "Default": 7.2E+7 } } }, diff --git a/MCU_Wrapper/run_mex.bat b/MCU_Wrapper/run_mex.bat index 3c6a052..2969767 100644 --- a/MCU_Wrapper/run_mex.bat +++ b/MCU_Wrapper/run_mex.bat @@ -64,10 +64,7 @@ set code_PERIPH=.\MCU_STM32F1xx_Matlab\stm32f1xx_matlab_conf.c^ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc.c^ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc_ex.c^ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c^ - .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_exti.c^ - .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_matlab_tim.c^ - .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c^ - .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c + .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_exti.c set includes_PERIPH=-I".\MCU_STM32F1xx_Matlab\."^ -I".\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK"^ diff --git a/app_wrapper/app_io.c b/app_wrapper/app_io.c index 7eb699f..ef5bb93 100644 --- a/app_wrapper/app_io.c +++ b/app_wrapper/app_io.c @@ -12,19 +12,6 @@ */ void app_readInputs(const real_T* Buffer) { // USER APP INPUT START -// Код для записи считывания входов из IO буфера -// Буфер в начале хранит входные порты S-Function, далее идут выходные порты: -// Buffer[0:15] - входной 1 порт, Buffer[16:31] - входной 2 порт, -// Buffer[32:47] - выходной 1 порт, Buffer[48:63] - выходной 2 порт -// -// Note: используте для чтения: -// val = ReadInputArray(arr_ind, val_ind) -// Пример: -// // запись в второй элемент первого массива -// app_variable = ReadInputArray(0, 1); -// // чтение из IO буфера напрямую -// app_variable_2 = Buffer[10]; - #define detect_front(_in_numb_, _var_, _val_) { \ if ((Buffer[_in_numb_] > 0.5) && (prev_in[_in_numb_] <= 0.5)) \ { \ @@ -79,19 +66,6 @@ if ((Buffer[_in_numb_] < 0.5) && (prev_in[_in_numb_] >= 0.5)) \ */ void app_writeOutputBuffer(real_T* Buffer) { // USER APP OUTPUT START -// Код для записи выходов в IO буфер -// Буфер в начале хранит входные порты S-Function, далее идут выходные порты: -// Buffer[0:15] - входной 1 порт, Buffer[16:31] - входной 2 порт, -// Buffer[32:47] - выходной 1 порт, Buffer[48:63] - выходной 2 порт -// -// Note: используте для записи: -// WriteOutputArray(val, arr_ind, val_ind) -// Пример: -// // запись в второй элемент первого массива -// WriteOutputArray(app_variable, 0, 1); -// // запись в IO буфер напрямую -// Buffer[XD_OUTPUT_START + 10] = app_variable_2; - for (int i = 0; i < 16; i++) { diff --git a/app_wrapper/app_wrapper.c b/app_wrapper/app_wrapper.c index 34b816b..b717f0a 100644 --- a/app_wrapper/app_wrapper.c +++ b/app_wrapper/app_wrapper.c @@ -9,10 +9,7 @@ void app_step(void) { // USER APP STEP START -// Код приложения МК для вызова в шаге симуляции -// -// Вызов разных функций на шаге симуляции в случае, -// если не используется отдельный поток для main(). + uwTick = hmcu.SystemClock / (MCU_CORE_CLOCK / 1000); upp_main(); diff --git a/mcu_test_r2023.slx b/mcu_test_r2023.slx index 5e34725..e828fb2 100644 Binary files a/mcu_test_r2023.slx and b/mcu_test_r2023.slx differ