добавлен конфиг для мейн параметров, плюс восстановлена колво портов модели

тесты
работает формирование сурсов и инклюдов по конфигу
2025-06-17 18:36:48 +03:00 · 2025-06-16 08:23:01 +03:00 · 2025-06-15 23:38:54 +03:00 · 2025-06-15 16:48:28 +03:00 · 2025-06-15 16:02:36 +03:00 · 2025-06-15 15:16:01 +03:00
26 changed files with 1691 additions and 513 deletions
--- a/App_Wrapper/app_io.c
+++ b/App_Wrapper/app_io.c
@@ -1,76 +0,0 @@
-#include "stm32f1xx_matlab_gpio.h"
-#include "upp.h"
-
-
-#define detect_front(_in_numb_, _var_, _val_) {             \
-if ((in[_in_numb_] > 0.5) && (prev_in[_in_numb_] <= 0.5))   \
-{                                                           \
-    _var_ = _val_;                                          \
-} }
-
-#define detect_rise(_in_numb_, _var_, _val_) {              \
-if ((in[_in_numb_] < 0.5) && (prev_in[_in_numb_] >= 0.5))   \
-{                                                           \
-    _var_ = _val_;                                          \
-} }
-
-
-
-void WriteFromSFunc(real_T* disc)
-{
-
-    for (int i = 0; i < PORT_WIDTH; i++)
-    {
-        if (GPIOA->ODR & (1 << i))
-        {
-            disc[i] = 1;
-        }
-
-        if (GPIOB->ODR & (1 << i))
-        {
-            disc[PORT_WIDTH + i] = 1;
-        }
-    }
-    disc[2 * PORT_WIDTH + 0] = phase_A.ctrl.angle.delay_us;
-    disc[2 * PORT_WIDTH + 1] = ((uint16_t)TIMER->CNT - phase_A.ctrl.angle.start_delay_tick);
-    disc[2 * PORT_WIDTH + 2] = phase_A.ctrl.angle.start_delay_tick;
-    disc[2 * PORT_WIDTH + 3] = TIMER->CNT;
-}
-
-
-
-void ReadToSFunc(real_T* in)
-{
-    static real_T prev_in[IN_PORT_WIDTH];
-
-    detect_front(0, phase_A.zc_detector.f.EXTIZeroCrossDetected, 1);
-    detect_rise(0, phase_A.zc_detector.f.EXTIZeroCrossDetected, 1);
-
-    detect_front(1, phase_B.zc_detector.f.EXTIZeroCrossDetected, 1);
-    detect_rise(1, phase_B.zc_detector.f.EXTIZeroCrossDetected, 1);
-
-    detect_front(2, phase_C.zc_detector.f.EXTIZeroCrossDetected, 1);
-    detect_rise(2, phase_C.zc_detector.f.EXTIZeroCrossDetected, 1);
-
-    detect_front(3, Upp.GoSafe, 1);
-    detect_rise(3, Upp.GoSafe, 0);
-
-    detect_front(4, Upp.Prepare, 1);
-    detect_rise(4, Upp.Prepare, 0);
-
-    detect_front(5, Upp.ForceStop, 1);
-    detect_rise(5, Upp.ForceStop, 0);
-
-    detect_front(6, Upp.ForceDisconnect, 1);
-    detect_rise(6, Upp.ForceDisconnect, 0);
-
-
-    Upp.sine_freq = in[7];
-    Upp.Duration = in[8];
-
-
-    for (int i = 0; i < IN_PORT_WIDTH; i++)
-    {
-        prev_in[i] = in[i];
-    }
-}
--- a/App_Wrapper/main.c
+++ b/App_Wrapper/main.c
@@ -1,193 +0,0 @@
-/* USER CODE BEGIN Header */
-/**
-  ******************************************************************************
-  * @file           : main.c
-  * @brief          : Main program body
-  ******************************************************************************
-  * @attention
-  *
-  * Copyright (c) 2025 STMicroelectronics.
-  * All rights reserved.
-  *
-  * This software is licensed under terms that can be found in the LICENSE file
-  * in the root directory of this software component.
-  * If no LICENSE file comes with this software, it is provided AS-IS.
-  *
-  ******************************************************************************
-  */
-  /* USER CODE END Header */
-  /* Includes ------------------------------------------------------------------*/
-#include "main.h"
-#include "adc.h"
-#include "tim.h"
-#include "usart.h"
-#include "gpio.h"
-
-/* Private includes ----------------------------------------------------------*/
-/* USER CODE BEGIN Includes */
-#include "upp.h"
-/* USER CODE END Includes */
-
-/* Private typedef -----------------------------------------------------------*/
-/* USER CODE BEGIN PTD */
-
-/* USER CODE END PTD */
-
-/* Private define ------------------------------------------------------------*/
-/* USER CODE BEGIN PD */
-
-/* USER CODE END PD */
-
-/* Private macro -------------------------------------------------------------*/
-/* USER CODE BEGIN PM */
-
-/* USER CODE END PM */
-
-/* Private variables ---------------------------------------------------------*/
-
-/* USER CODE BEGIN PV */
-
-/* USER CODE END PV */
-
-/* Private function prototypes -----------------------------------------------*/
-void SystemClock_Config(void);
-/* USER CODE BEGIN PFP */
-
-/* USER CODE END PFP */
-
-/* Private user code ---------------------------------------------------------*/
-/* USER CODE BEGIN 0 */
-
-/* USER CODE END 0 */
-
-/**
-  * @brief  The application entry point.
-  * @retval int
-  */
-int main_init(void)
-{
-
-    /* USER CODE BEGIN 1 */
-
-    /* USER CODE END 1 */
-
-    /* MCU Configuration--------------------------------------------------------*/
-
-    /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
-    HAL_Init();
-
-    /* USER CODE BEGIN Init */
-
-    /* USER CODE END Init */
-
-    /* Configure the system clock */
-    SystemClock_Config();
-
-    /* USER CODE BEGIN SysInit */
-
-    /* USER CODE END SysInit */
-
-    /* Initialize all configured peripherals */
-    MX_GPIO_Init();
-    MX_TIM2_Init();
-    /* USER CODE BEGIN 2 */
-    upp_init();
- 
-    /* USER CODE END 2 */
-
-    /* Infinite loop */
-    /* USER CODE BEGIN WHILE */
-    //while (1)
-    //{
-    //    upp_main();
-    //    /* USER CODE END WHILE */
-
-    //    /* USER CODE BEGIN 3 */
-    //}
-    /* USER CODE END 3 */
-}
-
-uint32_t HAL_RCCEx_GetPeriphCLKFreq(uint32_t PeriphClk) {}
-//HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef* hadc) {}
-
-/**
-  * @brief System Clock Configuration
-  * @retval None
-  */
-void SystemClock_Config(void)
-{
-    //RCC_OscInitTypeDef RCC_OscInitStruct = { 0 };
-    //RCC_ClkInitTypeDef RCC_ClkInitStruct = { 0 };
-    //RCC_PeriphCLKInitTypeDef PeriphClkInit = { 0 };
-
-    ///** Initializes the RCC Oscillators according to the specified parameters
-    //* in the RCC_OscInitTypeDef structure.
-    //*/
-    //RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
-    //RCC_OscInitStruct.HSEState = RCC_HSE_ON;
-    //RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
-    //RCC_OscInitStruct.HSIState = RCC_HSI_ON;
-    //RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
-    //RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
-    //RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
-    //if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
-    //{
-    //    Error_Handler();
-    //}
-
-    ///** Initializes the CPU, AHB and APB buses clocks
-    //*/
-    //RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
-    //    | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
-    //RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
-    //RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-    //RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
-    //RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
-
-    //if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK)
-    //{
-    //    Error_Handler();
-    //}
-    //PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC;
-    //PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
-    //if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK)
-    //{
-    //    Error_Handler();
-    //}
-}
-
-/* USER CODE BEGIN 4 */
-
-/* USER CODE END 4 */
-
-/**
-  * @brief  This function is executed in case of error occurrence.
-  * @retval None
-  */
-void Error_Handler(void)
-{
-    /* USER CODE BEGIN Error_Handler_Debug */
-    /* User can add his own implementation to report the HAL error return state */
-    __disable_irq();
-    while (1)
-    {
-    }
-    /* USER CODE END Error_Handler_Debug */
-}
-
-#ifdef  USE_FULL_ASSERT
-/**
-  * @brief  Reports the name of the source file and the source line number
-  *         where the assert_param error has occurred.
-  * @param  file: pointer to the source file name
-  * @param  line: assert_param error line source number
-  * @retval None
-  */
-void assert_failed(uint8_t* file, uint32_t line)
-{
-    /* USER CODE BEGIN 6 */
-    /* User can add his own implementation to report the file name and line number,
-       ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
-       /* USER CODE END 6 */
-}
-#endif /* USE_FULL_ASSERT */
--- a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
+++ b/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
@@ -28,9 +28,12 @@ extern "C" {

 /* Includes ------------------------------------------------------------------*/
 #include "stm32f1xx.h"
+#include "stm32_defs.h"
 #include "Legacy/stm32_hal_legacy.h"
 #include <stddef.h>
-#include "mcu_wrapper_conf.h"
+#include "stm32f1xx_matlab_rcc.h"
+#include "stm32f1xx_matlab_gpio.h"
+#include "stm32f1xx_matlab_tim.h"

 /* Exported types ------------------------------------------------------------*/

--- a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/hal_json_with_defines(alias).txt
+++ b/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_HAL_Driver/hal_json_with_defines(alias).txt
@@ -0,0 +1,356 @@
+
+      "USE_HAL": {
+        "Prompt": "Use HAL",
+        "Def": "USE_HAL_DRIVER",
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": true
+      },
+      "HAL_ADC": {
+        "Prompt": "Enable HAL_ADC Module",
+        "Def": "HAL_ADC_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_CRYP": {
+        "Prompt": "Enable HAL_CRYP Module",
+        "Def": "HAL_CRYP_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cryp.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_CAN": {
+        "Prompt": "Enable HAL_CAN Module",
+        "Def": "HAL_CAN_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_CAN_LEGACY": {
+        "Prompt": "Enable HAL_CAN_LEGACY Module",
+        "Def": "HAL_CAN_LEGACY_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can_legacy.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_CEC": {
+        "Prompt": "Enable HAL_CEC Module",
+        "Def": "HAL_CEC_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_CORTEX": {
+        "Prompt": "Enable HAL_CORTEX Module",
+        "Def": "HAL_CORTEX_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_CRC": {
+        "Prompt": "Enable HAL_CRC Module",
+        "Def": "HAL_CRC_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_DAC": {
+        "Prompt": "Enable HAL_DAC Module",
+        "Def": "HAL_DAC_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_DMA": {
+        "Prompt": "Enable HAL_DMA Module",
+        "Def": "HAL_DMA_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_ETH": {
+        "Prompt": "Enable HAL_ETH Module",
+        "Def": "HAL_ETH_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_FLASH": {
+        "Prompt": "Enable HAL_FLASH Module",
+        "Def": "HAL_FLASH_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_GPIO": {
+        "Prompt": "Enable HAL_GPIO Module",
+        "Def": "HAL_GPIO_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_I2C": {
+        "Prompt": "Enable HAL_I2C Module",
+        "Def": "HAL_I2C_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_I2S": {
+        "Prompt": "Enable HAL_I2S Module",
+        "Def": "HAL_I2S_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_IRDA": {
+        "Prompt": "Enable HAL_IRDA Module",
+        "Def": "HAL_IRDA_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_IWDG": {
+        "Prompt": "Enable HAL_IWDG Module",
+        "Def": "HAL_IWDG_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_NOR": {
+        "Prompt": "Enable HAL_NOR Module",
+        "Def": "HAL_NOR_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_NAND": {
+        "Prompt": "Enable HAL_NAND Module",
+        "Def": "HAL_NAND_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_PCCARD": {
+        "Prompt": "Enable HAL_PCCARD Module",
+        "Def": "HAL_PCCARD_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_PCD": {
+        "Prompt": "Enable HAL_PCD Module",
+        "Def": "HAL_PCD_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_HCD": {
+        "Prompt": "Enable HAL_HCD Module",
+        "Def": "HAL_HCD_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_PWR": {
+        "Prompt": "Enable HAL_PWR Module",
+        "Def": "HAL_PWR_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_RCC": {
+        "Prompt": "Enable HAL_RCC Module",
+        "Def": "HAL_RCC_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c"
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_RTC": {
+        "Prompt": "Enable HAL_RTC Module",
+        "Def": "HAL_RTC_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c"
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_SD": {
+        "Prompt": "Enable HAL_SD Module",
+        "Def": "HAL_SD_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_MMC": {
+        "Prompt": "Enable HAL_MMC Module",
+        "Def": "HAL_MMC_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_SDRAM": {
+        "Prompt": "Enable HAL_SDRAM Module",
+        "Def": "HAL_SDRAM_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sdram.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_SMARTCARD": {
+        "Prompt": "Enable HAL_SMARTCARD Module",
+        "Def": "HAL_SMARTCARD_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_SPI": {
+        "Prompt": "Enable HAL_SPI Module",
+        "Def": "HAL_SPI_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_SRAM": {
+        "Prompt": "Enable HAL_SRAM Module",
+        "Def": "HAL_SRAM_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_TIM": {
+        "Prompt": "Enable HAL_TIM Module",
+        "Def": "HAL_TIM_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c"
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_UART": {
+        "Prompt": "Enable HAL_UART Module",
+        "Def": "HAL_UART_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_USART": {
+        "Prompt": "Enable HAL_USART Module",
+        "Def": "HAL_USART_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_WWDG": {
+        "Prompt": "Enable HAL_WWDG Module",
+        "Def": "HAL_WWDG_MODULE_ENABLED",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
--- a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.h
+++ b/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.h
@@ -2,7 +2,8 @@
 #define _MATLAB_GPIO_H_

 #include "simstruc.h"
-#include "mcu_wrapper_conf.h"
+#include "stm32f1xx_matlab_conf.h"
+//#include "mcu_wrapper_conf.h"

 /* äåôàéíû äëÿ ïðîâåðêè êîíôèãóðàöèè GPIO) */
 #define GET_GPIO_CONF(_reg_, _pos_)         ((_pos_ < 8)?                                                                                                   \
@@ -17,7 +18,5 @@


 void Simulate_GPIO_BSRR(void);
-void WriteFromSFunc(real_T* disc);
-void ReadToSFunc(real_T* in);

 #endif // _MATLAB_GPIO_H_
--- a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.h
+++ b/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_rcc.h
@@ -1,7 +1,7 @@
 #ifndef _MATLAB_RCC_H_
 #define _MATLAB_RCC_H_

-#include "mcu_wrapper_conf.h"
+#include "stm32f1xx_matlab_conf.h"



@@ -9,11 +9,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)36000000;
-#define ABP1_TIMS_Value		(double)72000000;
-#define ABP2_Value			(double)72000000;
-#define ABP2_TIMS_Value		(double)72000000;
+//#define HCLK_Value			(double)72000000;
+//#define ABP1_Value			(double)36000000;
+//#define ABP1_TIMS_Value		(double)72000000;
+//#define ABP2_Value			(double)72000000;
+//#define ABP2_TIMS_Value		(double)72000000;

 /* Ýòè äåôàéíû äîáàâëåíû â êîä stm32f4xx_hal_rcc.c, ÷òîáû íå ïîïàñòü â áåñêîíå÷íûé öèêë */
 /* Ìá ïåðåíåñòè â MCU_Periph_Simulation(), íî ÷åò íå õî÷åòñÿ íàãðóæàòü ñèìóëÿöèþ ýòîé õåðíåé*/
--- a/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.h
+++ b/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.h
@@ -6,7 +6,8 @@
 #define _MATLAB_TIM_H_

 #include "stm32f1xx_it.h"
-#include "mcu_wrapper_conf.h"
+#include "stm32f1xx_matlab_conf.h"
+//#include "mcu_wrapper_conf.h"



--- a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.c
+++ b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.c
@@ -3,6 +3,7 @@
 äåôàéíàìè â stm32f4xx_matlab_conf.h.

 **************************************************************************/
+#include "stm32f1xx_matlab_conf.h"
 #include "mcu_wrapper_conf.h"

 MCU_MemoryTypeDef MCU_MEM;
@@ -85,7 +86,7 @@ void Init_TIM_SIM(void)
 {
 #ifdef USE_TIM1    
 	tim1s.tx_cnt = TIM1->CNT;
-	tim1s.tx_step = hmcu.SIM_Sample_Time * ABP2_TIMS_Value;
+	tim1s.tx_step = hmcu.sSimSampleTime * ABP2_TIMS_Value;

 	tim1s.Channels.OC1_GPIOx = GPIOA;
 	tim1s.Channels.OC1_PIN_SHIFT = 8;
@@ -98,7 +99,7 @@ void Init_TIM_SIM(void)
 #endif
 #ifdef USE_TIM2
 	tim2s.tx_cnt = TIM2->CNT;
-	tim2s.tx_step = hmcu.SIM_Sample_Time * ABP1_TIMS_Value;
+	tim2s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;

 	tim2s.Channels.OC1_GPIOx = GPIOA;
 	tim2s.Channels.OC1_PIN_SHIFT = 5;
@@ -111,7 +112,7 @@ void Init_TIM_SIM(void)
 #endif
 #ifdef USE_TIM3
 	tim3s.tx_cnt = TIM3->CNT;
-	tim3s.tx_step = hmcu.SIM_Sample_Time * ABP1_TIMS_Value;
+	tim3s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;

 	tim3s.Channels.OC1_GPIOx = GPIOB;
 	tim3s.Channels.OC1_PIN_SHIFT = 4;
@@ -124,7 +125,7 @@ void Init_TIM_SIM(void)
 #endif
 #ifdef USE_TIM4	
 	tim4s.tx_cnt = TIM4->CNT;
-	tim4s.tx_step = hmcu.SIM_Sample_Time * ABP1_TIMS_Value;
+	tim4s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;

 	tim4s.Channels.OC1_GPIOx = GPIOD;
 	tim4s.Channels.OC1_PIN_SHIFT = 12;
@@ -137,7 +138,7 @@ void Init_TIM_SIM(void)
 #endif
 #ifdef USE_TIM5
 	tim5s.tx_cnt = TIM5->CNT;
-	tim5s.tx_step = hmcu.SIM_Sample_Time * ABP1_TIMS_Value;
+	tim5s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;

 	tim5s.Channels.OC1_GPIOx = GPIOA;
 	tim5s.Channels.OC1_PIN_SHIFT = 0;
@@ -150,7 +151,7 @@ void Init_TIM_SIM(void)
 #endif
 #ifdef USE_TIMx
 	tim6s.tx_cnt = TIMx->CNT;
-	tim6s.tx_step = hmcu.SIM_Sample_Time * ABP1_TIMS_Value;
+	tim6s.tx_step = hmcu.sSimSampleTime * ABP1_TIMS_Value;

 	tim6s.Channels.OC1_GPIOx = GPIOA;
 	tim6s.Channels.OC1_PIN_SHIFT = 0;
--- a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.h
+++ b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.h
@@ -7,12 +7,11 @@
 #define _MATLAB_SETUP_H_
 #include "stm32_defs.h"
 #include "stm32f1xx_hal.h"
-//#include "mcu_wrapper_conf.h"

 // DEFINES (UNCOMMENT WHAT YOU WILL SIMULATE)
 // TIMS
 //#define USE_TIM1
-#define USE_TIM2
+//#define USE_TIM2
 //#define USE_TIM3
 //#define USE_TIM4
 //#define USE_TIM5
--- a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json
+++ b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json
@@ -0,0 +1,605 @@
+{
+  "MainCode": {
+    "Includes": [
+      ".",
+      "Drivers/STM32F1xx_SIMULINK",
+      "Drivers/CMSIS",
+      "Drivers/CMSIS/Device/STM32F1xx",
+      "Drivers/STM32F1xx_HAL_Driver/Inc",
+      "Drivers/STM32F1xx_HAL_Driver/Inc/Legacy"
+    ]
+  },
+  "UserCode": {
+    "Functions": {
+      "PeriphInit": [
+        "Initialize_Periph_Sim()"
+      ],
+      "PeriphSimulation": [
+        "Simulate_TIMs()",
+        "Simulate_GPIO_BSRR()"
+      ],
+      "PeriphDeinit": [
+        "deInitialize_Periph_Sim()"
+      ]
+    }
+  },
+  "Main": {
+    "Sources": [
+      "stm32f1xx_matlab_conf.c",
+      "Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.c",
+      "Drivers/STM32F1xx_SIMULINK/stm32f1xx_periph_registers.c"
+    ],
+    "Defines": {
+      "STM32xx": {
+        "Prompt": "Choose MCU",
+        "Def": [
+          "STM32F103xB"
+        ],
+        "Type": "popup",
+        "NewRow": true
+      },
+      "Tab_TIM_Enable": {
+        "Prompt": "Enable TIMs",
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": true
+      },
+      "Tab_ADC_Enable": {
+        "Prompt": "Enable ADCs",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      }
+    }
+  },
+  "HAL": {
+    "Defines": {
+      "USE_HAL": {
+        "Prompt": "Use HAL",
+        "Def": "USE_HAL_DRIVER",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c"
+        ],
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": true
+      },
+      "HAL_ADC": {
+        "Prompt": "Enable HAL ADC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": true
+      },
+      "HAL_CRYP": {
+        "Prompt": "Enable HAL CRYP Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cryp.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_CAN": {
+        "Prompt": "Enable HAL CAN Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_CAN_LEGACY": {
+        "Prompt": "Enable HAL CAN_LEGACY Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can_legacy.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_CEC": {
+        "Prompt": "Enable HAL CEC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_CORTEX": {
+        "Prompt": "Enable HAL CORTEX Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c"
+        ],
+        "Type": "checkbox",
+        "Default": true
+      },
+      "HAL_CRC": {
+        "Prompt": "Enable HAL CRC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_DAC": {
+        "Prompt": "Enable HAL DAC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dac_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_DMA": {
+        "Prompt": "Enable HAL DMA Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c"
+        ],
+        "Type": "checkbox",
+        "Default": true
+      },
+      "HAL_ETH": {
+        "Prompt": "Enable HAL ETH Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_FLASH": {
+        "Prompt": "Enable HAL FLASH Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_EXTI": {
+        "Prompt": "Enable HAL EXTI Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c"
+        ],
+        "Type": "checkbox",
+        "Default": true
+      },
+      "HAL_GPIO": {
+        "Prompt": "Enable HAL GPIO Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": true
+      },
+      "HAL_I2C": {
+        "Prompt": "Enable HAL I2C Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_I2S": {
+        "Prompt": "Enable HAL I2S Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_IRDA": {
+        "Prompt": "Enable HAL IRDA Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_IWDG": {
+        "Prompt": "Enable HAL IWDG Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_NOR": {
+        "Prompt": "Enable HAL NOR Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_NAND": {
+        "Prompt": "Enable HAL NAND Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_PCCARD": {
+        "Prompt": "Enable HAL PCCARD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_PCD": {
+        "Prompt": "Enable HAL PCD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pcd_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_HCD": {
+        "Prompt": "Enable HAL HCD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_PWR": {
+        "Prompt": "Enable HAL PWR Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c"
+        ],
+        "Type": "checkbox",
+        "Default": true
+      },
+      "HAL_RCC": {
+        "Prompt": "Enable HAL RCC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c"
+        ],
+        "Type": "checkbox",
+        "Default": true
+      },
+      "HAL_RTC": {
+        "Prompt": "Enable HAL RTC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_SD": {
+        "Prompt": "Enable HAL SD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_MMC": {
+        "Prompt": "Enable HAL MMC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_SDRAM": {
+        "Prompt": "Enable HAL SDRAM Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sdram.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_SMARTCARD": {
+        "Prompt": "Enable HAL SMARTCARD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_SPI": {
+        "Prompt": "Enable HAL SPI Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_SRAM": {
+        "Prompt": "Enable HAL SRAM Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_TIM": {
+        "Prompt": "Enable HAL TIM Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": true
+      },
+      "HAL_UART": {
+        "Prompt": "Enable HAL UART Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_USART": {
+        "Prompt": "Enable HAL USART Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      },
+      "HAL_WWDG": {
+        "Prompt": "Enable HAL WWDG Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c"
+        ],
+        "Type": "checkbox",
+        "Default": false
+      }
+    }
+  },
+  "RCC": {
+    "Defines": {
+      "HCLK_Clock": {
+        "Prompt": "HCLK Clock (Hz)",
+        "Def": "HCLK_Value",
+        "Type": "edit",
+        "Default": 7.2E+7
+      },
+      "ABP1_Clock": {
+        "Prompt": "ABP1 Clock (Hz)",
+        "Def": "ABP1_Value",
+        "Type": "edit",
+        "Default": 7.2E+7
+      },
+      "ABP1_TIMS_Clock": {
+        "Prompt": "ABP1 Tim's Clock (Hz)",
+        "Def": "ABP1_TIMS_Value",
+        "Type": "edit",
+        "Default": 7.2E+7
+      },
+      "ABP2_Clock": {
+        "Prompt": "ABP2 Clock (Hz)",
+        "Def": "ABP2_Value",
+        "Type": "edit",
+        "Default": 7.2E+7
+      },
+      "ABP2_TIMS_Clock": {
+        "Prompt": "ABP2 Tim's Clock (Hz)",
+        "Def": "ABP2_TIMS_Value",
+        "Type": "edit",
+        "Default": 7.2E+7
+      }
+    }
+  },
+  "TIM": {
+    "Sources": [
+      "Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.c"
+    ],
+    "Defines": {
+      "TIM1_Enable": {
+        "Prompt": "TIM1 Enable",
+        "Def": "USE_TIM1",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM1_BRK_TIM9_Handler": {
+        "Prompt": "TIM1_BRK_TIM9 Handler",
+        "Def": "USE_TIM1_BRK_TIM9_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM2_Enable": {
+        "Prompt": "TIM2 Enable",
+        "Def": "USE_TIM2",
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": true
+      },
+      "TIM1_UP_TIM10_Handler": {
+        "Prompt": "TIM1_UP_TIM10 Handler",
+        "Def": "USE_TIM1_UP_TIM10_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM3_Enable": {
+        "Prompt": "TIM3 Enable",
+        "Def": "USE_TIM3",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM1_TRG_COM_TIM11_Handler": {
+        "Prompt": "TIM1_TRG_COM_TIM11 Handler",
+        "Def": "USE_TIM1_TRG_COM_TIM11_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM4_Enable": {
+        "Prompt": "TIM4 Enable",
+        "Def": "USE_TIM4",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM2_Handler": {
+        "Prompt": "TIM2 Handler",
+        "Def": "USE_TIM2_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM5_Enable": {
+        "Prompt": "TIM5 Enable",
+        "Def": "USE_TIM5",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM3_Handler": {
+        "Prompt": "TIM3 Handler",
+        "Def": "USE_TIM3_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM6_Enable": {
+        "Prompt": "TIM6 Enable",
+        "Def": "USE_TIM6",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM4_Handler": {
+        "Prompt": "TIM4 Handler",
+        "Def": "USE_TIM4_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM7_Enable": {
+        "Prompt": "TIM7 Enable",
+        "Def": "USE_TIM7",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM5_Handler": {
+        "Prompt": "TIM5 Handler",
+        "Def": "USE_TIM5_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM8_Enable": {
+        "Prompt": "TIM8 Enable",
+        "Def": "USE_TIM8",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM6_Handler": {
+        "Prompt": "TIM6 Handler",
+        "Def": "USE_TIM6_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM9_Enable": {
+        "Prompt": "TIM9 Enable",
+        "Def": "USE_TIM9",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM7_Handler": {
+        "Prompt": "TIM7 Handler",
+        "Def": "USE_TIM7_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM10_Enable": {
+        "Prompt": "TIM10 Enable",
+        "Def": "USE_TIM10",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM8_BRK_TIM12_Handler": {
+        "Prompt": "TIM8_BRK_TIM12 Handler",
+        "Def": "USE_TIM8_BRK_TIM12_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM11_Enable": {
+        "Prompt": "TIM11 Enable",
+        "Def": "USE_TIM11",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM8_UP_TIM13_Handler": {
+        "Prompt": "TIM8_UP_TIM13 Handler",
+        "Def": "USE_TIM8_UP_TIM13_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM12_Enable": {
+        "Prompt": "TIM12 Enable",
+        "Def": "USE_TIM12",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM8_TRG_COM_TIM14_Handler": {
+        "Prompt": "TIM8_TRG_COM_TIM14 Handler",
+        "Def": "USE_TIM8_TRG_COM_TIM14_HANDLER",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "TIM13_Enable": {
+        "Prompt": "TIM13 Enable",
+        "Def": "USE_TIM13",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "TIM14_Enable": {
+        "Prompt": "TIM14 Enable",
+        "Def": "USE_TIM14",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      }
+    }
+  },
+  "ADC": {
+    "Defines": {
+      "ADC1_Enable": {
+        "Prompt": "ADC1 Enable",
+        "Def": "ADC1_ENABLE",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "ADC2_Enable": {
+        "Prompt": "ADC2 Enable",
+        "Def": "ADC2_ENABLE",
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "Sample_Rate": {
+        "Prompt": "Sample Rate (Hz)",
+        "Def": "SAMPLE_RATE",
+        "Type": "edit",
+        "Default": 48000,
+        "NewRow": true
+      }
+    }
+  }
+}
--- a/MCU_Wrapper/MCU.c
+++ b/MCU_Wrapper/MCU.c
@@ -19,7 +19,7 @@
  * @{
  */

-#define S_FUNCTION_NAME     MCU
+#define S_FUNCTION_NAME MCU
 #define S_FUNCTION_LEVEL    2

 #include "mcu_wrapper_conf.h"
@@ -111,16 +111,18 @@ static void mdlInitializeSizes(SimStruct* S)
 	ssSetNumDiscStates(S, DISC_STATES_WIDTH);	// number of discrete states

 	// set up input port
-	if (!ssSetNumInputPorts(S, 1)) return;
+	if (!ssSetNumInputPorts(S, IN_PORT_NUMB)) return;
 	for (int i = 0; i < IN_PORT_NUMB; i++)
-		ssSetInputPortWidth(S, i, IN_PORT_WIDTH);
-	ssSetInputPortDirectFeedThrough(S, 0, 0);
-	ssSetInputPortRequiredContiguous(S, 0, 1); // direct input signal access
+	{
+		ssSetInputPortWidth(S, i, inLengths[i]);
+		ssSetInputPortDirectFeedThrough(S, i, 0);
+		ssSetInputPortRequiredContiguous(S, i, 1);
+	}

 	// set up output port
 	if (!ssSetNumOutputPorts(S, OUT_PORT_NUMB)) return;
 	for (int i = 0; i < OUT_PORT_NUMB; i++)
-		ssSetOutputPortWidth(S, i, OUT_PORT_WIDTH);
+		ssSetOutputPortWidth(S, i, outLengths[i]);


 	ssSetNumSampleTimes(S, 1);
@@ -152,7 +154,7 @@ static void mdlInitializeSizes(SimStruct* S)
 */
 static void mdlStart(SimStruct* S)
 {
-	SIM_Initialize_Simulation();
+	SIM_Initialize_Simulation(S);
 }
 #endif // MDL_START

@@ -167,10 +169,10 @@ static void mdlStart(SimStruct* S)
 static void mdlInitializeSampleTimes(SimStruct* S)
 {
 	// Шаг дискретизации
-	hmcu.SIM_Sample_Time = mxGetPr(ssGetSFcnParam(S, NPARAMS - 1))[0];
+	hmcu.sSimSampleTime = mxGetPr(ssGetSFcnParam(S, NPARAMS - 1))[0];

 	// Register one pair for each sample time
-	ssSetSampleTime(S, 0, hmcu.SIM_Sample_Time);
+	ssSetSampleTime(S, 0, hmcu.sSimSampleTime);
 	ssSetOffsetTime(S, 0, 0.0);
 }

@@ -189,7 +191,7 @@ static void mdlTerminate(SimStruct* S)
 	ResumeThread(hmcu.hMCUThread);
 	WaitForSingleObject(hmcu.hMCUThread, 10000);
 #endif
-	SIM_deInitialize_Simulation();
+	SIM_deInitialize_Simulation(S);
 	mexUnlock();
 }

--- a/MCU_Wrapper/WrapperConfig.json
+++ b/MCU_Wrapper/WrapperConfig.json
@@ -0,0 +1,71 @@
+{
+  "wrapperPath": {
+    "Prompt": "",
+    "Type": "edit",
+    "Default": ".\\MCU_Wrapper"
+  },
+  "enableDebug": {
+    "Prompt": "Enable Debug",
+    "Type": "checkbox",
+    "Default": true
+  },
+  "mcuClk": {
+    "Prompt": "MCU Core Clock (MHz)",
+    "Type": "edit",
+    "Default": "72*10^6",
+    "Def": "MCU_CORE_CLOCK"
+  },
+  "threadCycles": {
+    "Prompt": "Deckstop cycles per MCU simulation step",
+    "Type": "edit",
+    "Default": 255,
+    "Def": "DEKSTOP_CYCLES_FOR_MCU_APP"
+  },
+  "enableThreading": {
+    "Prompt": "Run MCU main() in a separate thread",
+    "Type": "checkbox",
+    "Default": false,
+    "Def": "RUN_APP_MAIN_FUNC_THREAD"
+  },
+  "enableDeinit": {
+    "Prompt": "Deinitialize model after simulation",
+    "Type": "checkbox",
+    "Default": true,
+    "Def": "DEINITIALIZE_AFTER_SIM"
+  },
+  "appWrapperPath": {
+    "Prompt": "",
+    "Type": "edit",
+    "Default": ".\\app_wrapper"
+  },
+  "srcTable": {
+    "Prompt": "",
+    "Type": "customtable",
+    "Default": [
+      "..\\mcu_project\\upp\\Core\\Src\\gpio.c",
+      "..\\mcu_project\\upp\\Core\\Src\\stm32f1xx_hal_msp.c",
+      "..\\mcu_project\\upp\\Core\\Src\\stm32f1xx_it.c",
+      "..\\mcu_project\\upp\\Core\\Src\\system_stm32f1xx.c",
+      "..\\mcu_project\\upp\\Core\\Src\\tim.c",
+      "..\\mcu_project\\upp\\Core\\upp\\tiristor.c",
+      "..\\mcu_project\\upp\\Core\\upp\\upp.c",
+      "..\\mcu_project\\upp\\Core\\upp\\zero_cross.c",
+      "..\\mcu_project\\upp\\Core\\Src\\adc.c"
+    ],
+    "Def": "Files"
+  },
+  "incTable": {
+    "Prompt": "",
+    "Type": "customtable",
+    "Default": [
+      "..\\mcu_project\\upp\\Core\\Inc",
+      "..\\mcu_project\\upp\\Core\\upp"
+    ],
+    "Def": "Paths"
+  },
+  "userDefs": {
+    "Prompt": "User Defines",
+    "Type": "textarea",
+    "Default": "USE_HAL_DRIVER\nSTM32F103xB"
+  }
+}
--- a/MCU_Wrapper/mcu_wrapper.c
+++ b/MCU_Wrapper/mcu_wrapper.c
@@ -7,6 +7,7 @@
 Данный файл содержит функции для симуляции МК в Simulink (S-Function).
 **************************************************************************/
 #include "mcu_wrapper_conf.h"
+#include "app_wrapper.h"

 /**
    * @addtogroup	WRAPPER_CONF
@@ -15,6 +16,41 @@

 SIM__MCUHandleTypeDef hmcu;         ///< Хендл для управления потоком программы МК

+// INPUT/OUTPUTS AUTO-PARAMS START
+/**
+  * @brief Таблица длин массивов IN
+  */
+const int inLengths[IN_PORT_NUMB] = {
+    IN_PORT_1_WIDTH,
+    IN_PORT_2_WIDTH
+};
+/**
+  * @brief Таблица смещений в выходном массиве IN
+  */
+const int inOffsets[IN_PORT_NUMB] = {
+    OFFSET_IN_ARRAY_1,
+    OFFSET_IN_ARRAY_2
+};
+
+/**
+  * @brief Таблица длин массивов OUT
+  */
+const int outLengths[OUT_PORT_NUMB] = {
+    OUT_PORT_1_WIDTH,
+    OUT_PORT_2_WIDTH,
+    OUT_PORT_3_WIDTH
+};
+/**
+  * @brief Таблица смещений в выходном массиве OUT
+  */
+const int outOffsets[OUT_PORT_NUMB] = {
+    OFFSET_OUT_ARRAY_1,
+    OFFSET_OUT_ARRAY_2,
+    OFFSET_OUT_ARRAY_3
+};
+
+// INPUT/OUTPUTS AUTO-PARAMS END
+
 /** MCU_WRAPPER
    * @}
    */
@@ -50,22 +86,22 @@ unsigned __stdcall MCU_App_Thread(void) {
  */
 void MCU_Step_Simulation(SimStruct* S, time_T time)
 {
-    hmcu.SystemClockDouble += hmcu.SystemClock_step; // emulate core clock 
+    hmcu.SystemClockDouble += hmcu.sSystemClock_step; // emulate core clock 
    hmcu.SystemClock = hmcu.SystemClockDouble;
    hmcu.SimTime = time;

    MCU_readInputs(S); // считывание портов

-    MCU_Periph_Simulation(); // simulate peripheral
+    MCU_Periph_Simulation(S); // simulate peripheral

-    extern void upp_main(void);
-    upp_main();
 #ifdef RUN_APP_MAIN_FUNC_THREAD
    ResumeThread(hmcu.hMCUThread);
    for (int i = DEKSTOP_CYCLES_FOR_MCU_APP; i > 0; i--)
    {
    }
    SuspendThread(hmcu.hMCUThread);
+#else
+    app_step();
 #endif //RUN_APP_MAIN_FUNC_THREAD

    MCU_writeOutputs(S); // запись портов (по факту запись в буфер. запись в порты в mdlOutputs)
@@ -76,25 +112,26 @@ void MCU_Step_Simulation(SimStruct* S, time_T time)
  * @brief      Симуляция периферии МК
  * @details    Пользовательский код, который симулирует работу периферии МК.
  */
-void MCU_Periph_Simulation(void)
+void MCU_Periph_Simulation(SimStruct* S)
 {
-    uwTick = hmcu.SystemClock / (MCU_CORE_CLOCK / 1000);
-
-    Simulate_TIMs();   
+// PERIPH SIM START
+	Simulate_TIMs();
+	Simulate_GPIO_BSRR();
+// PERIPH SIM END
 }

 /* READ INPUTS S-FUNCTION TO MCU REGS */
 /**
  * @brief      Считывание входов S-Function в порты ввода-вывода.
 *	@param		S - указатель на структуру S-Function из "simstruc.h"
-  * @details    Пользовательский код, который записывает порты ввода-вывода из входов S-Function.
+  * @details    Пользовательский код, который записывает входы МК из входов S-Function.
  */
 void MCU_readInputs(SimStruct* S)
 {
-    /* Get S-Function inputs */
-    real_T* IN = ssGetInputPortRealSignal(S, 0);
-
-    ReadToSFunc(IN);
+    SIM_readInputs(S);
+    /* Get S-Function descrete array (IO buffer) */
+    real_T* In_Buff = ssGetDiscStates(S);
+    app_readInputs(In_Buff);
 }

 /* WRITE OUTPUTS BUFFER S-FUNCTION FROM MCU REGS*/
@@ -105,11 +142,10 @@ void MCU_readInputs(SimStruct* S)
  */
 void MCU_writeOutputs(SimStruct* S)
 {
-    /* Get S-Function descrete array */
+    /* Get S-Function descrete array (IO buffer) */
    real_T* Out_Buff = ssGetDiscStates(S);

-    Simulate_GPIO_BSRR();
-    WriteFromSFunc(Out_Buff);
+    app_writeOutputBuffer(Out_Buff);
 }
 //-----------------CONTROLLER SIMULATE FUNCTIONS---------------//
 //-------------------------------------------------------------//
@@ -118,36 +154,13 @@ void MCU_writeOutputs(SimStruct* S)

 //-------------------------------------------------------------//
 //----------------------SIMULINK FUNCTIONS---------------------//
-/* WRITE OUTPUTS OF S-BLOCK */
-/**
-  * @brief      Формирование выходов S-Function.
- *	@param		S - указатель на структуру S-Function из "simstruc.h"
-  * @details    Пользовательский код, который записывает выходы S-Function из буфера.
-  */
-void SIM_writeOutputs(SimStruct* S)
-{
-    real_T* GPIO;
-    real_T* Out_Buff = ssGetDiscStates(S);
-
-    //-------------WRITTING GPIOS---------------
-    for (int j = 0; j < PORT_NUMB; j++)
-    {
-        GPIO = ssGetOutputPortRealSignal(S, j);
-        for (int i = 0; i < PORT_WIDTH; i++)
-        {
-            GPIO[i] = Out_Buff[j * PORT_WIDTH + i];
-            Out_Buff[j * PORT_WIDTH + i] = 0;
-        }
-    }
-    //------------------------------------------
-}
 /* MCU WRAPPER DEINITIALIZATION */
 /**
  * @brief      Инициализация симуляции МК.
  * @details    Пользовательский код, который создает поток для приложения МК 
                и настраивает симулятор МК для симуляции.
  */
-void SIM_Initialize_Simulation(void)
+void SIM_Initialize_Simulation(SimStruct* S)
 {
 #ifdef RUN_APP_MAIN_FUNC_THREAD
    // инициализация потока, который будет выполнять код МК
@@ -155,27 +168,115 @@ void SIM_Initialize_Simulation(void)
 #endif //RUN_APP_MAIN_FUNC_THREAD

    /* user initialization */
-    Initialize_Periph_Sim();
+    app_init();
+// PERIPH INIT START
+	Initialize_Periph_Sim();
+// PERIPH INIT END
    
-    extern int main_init(void);
-    main_init();
-    /* wrapper initialization */
-    hmcu.SystemClock_step = MCU_CORE_CLOCK * hmcu.SIM_Sample_Time;   // set system clock step
+    /* clock step initialization */
+    hmcu.sSystemClock_step = MCU_CORE_CLOCK * hmcu.sSimSampleTime;   // set system clock step
+    hmcu.fInitDone = 1;
 }
 /* MCU WRAPPER DEINITIALIZATION */
 /**
  * @brief      Деинициализация симуляции МК.
  * @details    Пользовательский код, который будет очищать все структуры после окончания симуляции.
  */
-void SIM_deInitialize_Simulation(void)
+void SIM_deInitialize_Simulation(SimStruct* S)
 {
-//#ifdef DEINITIALIZE_AFTER_SIM
-#include "upp.h"
-    memset(&Upp, 0, sizeof(Upp));
-    // simulate structures of peripheral deinitialization
-    deInitialize_Periph_Sim();
-    // mcu peripheral memory deinitialization
-    deInitialize_MCU();
-//#endif
+#ifdef DEINITIALIZE_AFTER_SIM
+	// deinitialize app
+	app_deinit();
+// PERIPH DEINIT START
+	deInitialize_Periph_Sim();
+// PERIPH DEINIT END
+#endif// DEINITIALIZE_AFTER_SIM
+}
+/* WORK WITH IN/OUT BUFFER OF S-BLOCK */
+
+/**
+  * @brief Функция для записи переменной в буфер выходов в определенный массив
+  * @param xD           - указатель на буфер состояний
+  * @param value        - значение для записи
+  * @param array_index  - индекс выходного массива
+  * @param value_index  - индекс внутри массива
+  */
+void __WriteOutputArray(real_T* xD, float value, int array_index, int value_index)
+{
+    if (array_index >= OUT_PORT_NUMB)
+        return;
+
+    if (value_index >= outLengths[array_index])
+        return;
+
+    int global_index = XD_OUTPUT_START + outOffsets[array_index] + value_index;
+    xD[global_index] = value;
+}
+
+/**
+  * @brief Функция для чтения значения из буфера входов из определенного массива
+  * @param xD           - указатель на буфер состояний
+  * @param array_index  - индекс входного массива
+  * @param value_index  - индекс внутри массива
+  * @return             - считанное значение или 0.0 при выходе за границы
+  */
+float __ReadInputArray(const real_T* xD, int array_index, int value_index)
+{
+    if (array_index >= IN_PORT_NUMB)
+        return 0.0f;
+
+    if (value_index >= inLengths[array_index])
+        return 0.0f;
+
+    int global_index = XD_INPUT_START + inOffsets[array_index] + value_index;
+    return xD[global_index];
+}
+
+/**
+  * @brief      Формирование выходов S-Function.
+ *	@param		S - указатель на структуру S-Function из "simstruc.h"
+  * @details    Пользовательский код, который записывает выходы S-Function из буфера дискретных состояний.
+  */
+void SIM_writeOutputs(SimStruct* S)
+{
+    real_T* Output = ssGetOutputPortRealSignal(S,0);
+    real_T* Out_Buff = ssGetDiscStates(S);
+    int global_index;
+
+    //-------------WRITTING OUTPUT--------------
+    for (int arr_ind = 0; arr_ind < OUT_PORT_NUMB; arr_ind++)
+    {
+        Output = ssGetOutputPortRealSignal(S, arr_ind);
+        for (int val_ind = 0; val_ind < outLengths[arr_ind]; val_ind++)
+        {
+            global_index = XD_OUTPUT_START + outOffsets[arr_ind] + val_ind;
+            Output[val_ind] = Out_Buff[global_index];
+            Out_Buff[global_index] = 0;
+        }
+    }
+    //------------------------------------------
+}
+/**
+  * @brief      Формирование входов S-Function.
+ *	@param		S - указатель на структуру S-Function из "simstruc.h"
+  * @details    Пользовательский код, который считывает входы S-Function в буфер дискретных состояний.
+  */
+void SIM_readInputs(SimStruct* S)
+{
+    real_T* Input = ssGetInputPortRealSignal(S, 0);
+    real_T* In_Buff = ssGetDiscStates(S);
+    int global_index;
+
+    //-------------READING INPUTS---------------
+    for (int arr_ind = 0; arr_ind < IN_PORT_NUMB; arr_ind++)
+    {
+        Input = ssGetInputPortRealSignal(S, arr_ind);
+        for (int val_ind = 0; val_ind < inLengths[arr_ind]; val_ind++)
+        {
+            global_index = XD_INPUT_START + inOffsets[arr_ind] + val_ind;
+            In_Buff[global_index] = Input[val_ind];
+        }
+    }
+    //------------------------------------------
 }
 //-------------------------------------------------------------//
--- a/MCU_Wrapper/mcu_wrapper_conf.h
+++ b/MCU_Wrapper/mcu_wrapper_conf.h
@@ -25,56 +25,105 @@
 #define _WRAPPER_CONF_H_

 // Includes
-#include "stm32f1xx_matlab_conf.h"  // For stm simulate functions
 #include "simstruc.h"               // For S-Function variables
 #include <process.h>                // For threads

+#include "app_includes.h"
+

 /**
    * @defgroup	MCU_WRAPPER     MCU Wrapper
    * @brief 		Всякое для оболочки МК
    */

-    /**
-        * @addtogroup	WRAPPER_CONF    Wrapper Configuration
-        * @ingroup		MCU_WRAPPER
-        * @brief 		Параметры конфигурации для оболочки МК
-        * @details		Здесь дефайнами задается параметры оболочки, которые определяют как она будет работать
-        * @{
-        */
+/**
+    * @addtogroup	WRAPPER_CONF    Wrapper Configuration
+    * @ingroup		MCU_WRAPPER
+    * @brief 		Параметры конфигурации для оболочки МК
+    * @details		Здесь дефайнами задается параметры оболочки, которые определяют как она будет работать
+    * @{
+    */

-        // Parametrs of MCU simulator
+// Parametrs of MCU simulator
 //#define RUN_APP_MAIN_FUNC_THREAD                    ///< Enable using thread for MCU main() func
-#define DEKSTOP_CYCLES_FOR_MCU_APP      0xFF      ///< number of for() cycles after which MCU thread would be suspended 
-#define MCU_CORE_CLOCK                  72000000
+//#define DEKSTOP_CYCLES_FOR_MCU_APP      0xFFFF      ///< number of for() cycles after which MCU thread would be suspended 
+//#define MCU_CORE_CLOCK                  150000000   ///< MCU clock rate for simulation

-
-//#define DEINITIALIZE_AFTER_SIM                    ///< Enable deinitializing structures at simulation ends
-
-
-#define PORT_WIDTH                      16          ///< width of one port
-#define PORT_NUMB                       3           ///< amount of ports
 // Parameters of S_Function
-#define NPARAMS                 1                           ///< number of input parametrs (only Ts)
-#define IN_PORT_WIDTH           (9)                         ///< width of input ports
-#define IN_PORT_NUMB            1                           ///< number of input ports
-#define OUT_PORT_WIDTH          PORT_WIDTH                  ///< width of output ports
-#define OUT_PORT_NUMB           PORT_NUMB                   ///< number of output ports
-#define DISC_STATES_WIDTH       PORT_WIDTH*PORT_NUMB        ///< width of discrete states array
+// INPUT/OUTPUTS PARAMS START
+#define IN_PORT_NUMB           2
+#define IN_PORT_1_WIDTH        3
+#define IN_PORT_2_WIDTH        6

+#define OUT_PORT_NUMB           3
+#define OUT_PORT_1_WIDTH        16
+#define OUT_PORT_2_WIDTH        16
+#define OUT_PORT_3_WIDTH        16
+
+// INPUT/OUTPUTS PARAMS END
 /** WRAPPER_CONF
  * @}
  */


-  /**
-    * @addtogroup	MCU_WRAPPER
-    * @{
-    */

-    // Fixed parameters(?) of S_Function
+/**
+  * @addtogroup	MCU_WRAPPER
+  * @{
+  */
+
+/** @brief Записывает значение в выходной массив блока S-Function
+  * @param _var_ Значение, которое необходимо записать (будет преобразовано в float)
+  * @param _arr_ind_ Индекс выходного порта
+  * @param _val_ind_ Индекс элемента в выходном массиве
+  */
+#define	WriteOutputArray(_var_, _arr_ind_, _val_ind_)	__WriteOutputArray(Buffer, (float)_var_, _arr_ind_, _val_ind_)
+
+/** @brief Считывает значение из входного массива блока S-Function
+  * @param _var_ Значение, которое необходимо записать (будет преобразовано в float)
+  * @param _arr_ind_ Индекс входного порта
+  * @param _val_ind_ Индекс элемента во входном массиве
+  */
+#define	ReadInputArray(_arr_ind_, _val_ind_)		__ReadInputArray(Buffer, _arr_ind_, _val_ind_)
+
+
+
+// INPUT/OUTPUTS AUTO-PARAMS START
+/// === Полный размер буфера ===
+#define TOTAL_IN_SIZE (IN_PORT_1_WIDTH + IN_PORT_2_WIDTH)
+
+/// === Смещения массивов (внутри общего буфера) ===
+#define OFFSET_IN_ARRAY_1 0
+#define OFFSET_IN_ARRAY_2 (OFFSET_IN_ARRAY_1 + IN_PORT_1_WIDTH)
+
+/// === Полный размер буфера ===
+#define TOTAL_OUT_SIZE (OUT_PORT_1_WIDTH + OUT_PORT_2_WIDTH + OUT_PORT_3_WIDTH)
+
+/// === Смещения массивов (внутри общего буфера) ===
+#define OFFSET_OUT_ARRAY_1 0
+#define OFFSET_OUT_ARRAY_2 (OFFSET_OUT_ARRAY_1 + OUT_PORT_1_WIDTH)
+#define OFFSET_OUT_ARRAY_3 (OFFSET_OUT_ARRAY_2 + OUT_PORT_2_WIDTH)
+
+// INPUT/OUTPUTS AUTO-PARAMS END
+
+extern const int outLengths[OUT_PORT_NUMB];
+extern const int outOffsets[OUT_PORT_NUMB];
+extern const int inLengths[IN_PORT_NUMB];
+extern const int inOffsets[IN_PORT_NUMB];
+#define TOTAL_XD_SIZE (TOTAL_IN_SIZE + TOTAL_OUT_SIZE)
+#define XD_INPUT_START      0
+#define XD_OUTPUT_START     (XD_INPUT_START + TOTAL_IN_SIZE)
+
+
+
+
+
+// Fixed parameters(?) of S_Function
 #define NPARAMS                 1                               ///< number of input parametrs (only Ts)
-#define DISC_STATES_WIDTH       OUT_PORT_WIDTH*OUT_PORT_NUMB    ///< width of discrete states array (outbup buffer)
+#define DISC_STATES_WIDTH       TOTAL_XD_SIZE    ///< width of discrete states array (outbup buffer)
+
+
+
 /**
  * @brief      Define for creating thread in suspended state.
  * @details    Define from WinBase.h. We dont wanna include "Windows.h" or smth like this, because of HAL there are a lot of redefine errors.
@@ -89,15 +138,17 @@ typedef void* HANDLE; ///< MCU handle typedef
 typedef struct {
    // MCU Thread
    HANDLE          hMCUThread;                 ///< Хендл для потока МК
-    uint32_t        idMCUThread;                ///< id потока МК (unused)
+    int             idMCUThread;                ///< id потока МК (unused)
    // Flags
    unsigned        fMCU_Stop : 1;              ///< флаг для выхода из потока программы МК
-    double          SIM_Sample_Time;            ///< sample time of simulation
+    unsigned        fInitDone : 1;              ///< флаг для выхода из потока программы МК
+
+    double          SimTime;                    ///< Текущее время симуляции
+    long            SystemClock;                ///< Счетчик тактов для симуляции системных тиков (в целочисленном формате)

    double          SystemClockDouble;          ///< Счетчик в формате double для точной симуляции системных тиков С промежуточными значений
-    uint64_t        SystemClock;                ///< Счетчик тактов для симуляции системных тиков (в целочисленном формате)
-    double          SystemClock_step;           ///< Шаг тиков для их симуляции, в формате double
-    double          SimTime;
+    double          sSystemClock_step;          ///< Шаг тиков для их симуляции, в формате double
+    double          sSimSampleTime;             ///< Период дискретизации симуляции
 }SIM__MCUHandleTypeDef;
 extern SIM__MCUHandleTypeDef hmcu;              // extern для видимости переменной во всех файлах

@@ -112,43 +163,44 @@ extern SIM__MCUHandleTypeDef hmcu;              // extern для видимос
  */
 #define while(_expression_)                          sim_while(_expression_) 
 #endif
-  /* SIMULINK WHILE */
-  /**
-    * @brief      While statement for emulate MCU code in Simulink.
-    * @param      _expression_ - expression for while.
-    * @details    Данный while необходим, чтобы в конце симуляции, завершить поток МК:
-    *             При выставлении флага окончания симуляции, все while будут пропускаться
-    *             и поток сможет дойти до конца функции main и завершить себя.
-    */
+
+/* SIMULINK WHILE */
+/**
+  * @brief      While statement for emulate MCU code in Simulink.
+  * @param      _expression_ - expression for while.
+  * @details    Данный while необходим, чтобы в конце симуляции, завершить поток МК:
+  *             При выставлении флага окончания симуляции, все while будут пропускаться 
+  *             и поток сможет дойти до конца функции main и завершить себя. 
+  */    
 #define sim_while(_expression_)                     while((_expression_)&&(hmcu.fMCU_Stop == 0))

-    /* DEFAULT WHILE */
-    /**
-      * @brief      Default/Native C while statement.
-      * @param      _expression_ - expression for while.
-      * @details    Данный while - аналог обычного while, без дополнительного функционала.
-      */
+/* DEFAULT WHILE */
+/**
+  * @brief      Default/Native C while statement.
+  * @param      _expression_ - expression for while.
+  * @details    Данный while - аналог обычного while, без дополнительного функционала.
+  */
 #define native_while(_expression_)                   for(; (_expression_); )
-      /***************************************************************/
+  /***************************************************************/

-    //------------------  SIMULINK WHILE DEFINES  -----------------//
-    //-------------------------------------------------------------//
+//------------------  SIMULINK WHILE DEFINES  -----------------//
+//-------------------------------------------------------------//



-    //-------------------------------------------------------------//
-    //---------------- SIMULATE FUNCTIONS PROTOTYPES  -------------//
-    /* Step simulation */
-void MCU_Step_Simulation(SimStruct* S, time_T time);
+//-------------------------------------------------------------//
+//---------------- SIMULATE FUNCTIONS PROTOTYPES  -------------//
+/* Step simulation */
+void MCU_Step_Simulation(SimStruct *S, time_T time);     

 /* MCU peripheral simulation */
-void MCU_Periph_Simulation(void);
+void MCU_Periph_Simulation(SimStruct* S);

 /* Initialize MCU simulation */
-void SIM_Initialize_Simulation(void);
+void SIM_Initialize_Simulation(SimStruct* S);

 /* Deinitialize MCU simulation */
-void SIM_deInitialize_Simulation(void);
+void SIM_deInitialize_Simulation(SimStruct* S);

 /* Read inputs S-function  */
 void MCU_readInputs(SimStruct* S);
@@ -157,7 +209,16 @@ void MCU_readInputs(SimStruct* S);
 void MCU_writeOutputs(SimStruct* S);

 /* Write outputs of block of S-Function*/
-void SIM_writeOutput(SimStruct* S);
+void SIM_writeOutputs(SimStruct* S);
+
+/* Write inputs of block of S-Function*/
+void SIM_readInputs(SimStruct* S);
+
+/* Set output of block of S-Function*/
+void __WriteOutputArray(real_T* xD, float value, int array_index, int value_index);
+
+/* Get input of block of S-Function*/
+float __ReadInputArray(const real_T* xD, int array_index, int value_index);
 //---------------- SIMULATE FUNCTIONS PROTOTYPES  -------------//
 //-------------------------------------------------------------//

@@ -167,14 +228,14 @@ void SIM_writeOutput(SimStruct* S);
 #endif // _WRAPPER_CONF_H_


-    //-------------------------------------------------------------//
-    //---------------------BAT FILE DESCRIBTION--------------------//
-    /**
-      * @file run_mex.bat
-      * @brief Батник для компиляции оболочки МК.
-      * @details
-      * Вызывается в матлабе из mexing.m.
-      *
-      * Исходный код батника:
-      * @include F:\Work\Projects\MATLAB\matlab_stm_emulate\MCU_Wrapper\run_mex.bat
-      */
+//-------------------------------------------------------------//
+//---------------------BAT FILE DESCRIBTION--------------------//
+/**
+  * @file run_mex.bat
+  * @brief Батник для компиляции оболочки МК.
+  * @details
+  * Вызывается в матлабе из allmex.m.
+  * 
+  * Исходный код батника:
+  * @include run_mex.bat
+  */
--- a/MCU_Wrapper/run_mex.bat
+++ b/MCU_Wrapper/run_mex.bat
@@ -1,84 +1,147 @@
@echo off
+:: Получаем аргументы из командной строки
+:: %1 - includes_USER
+:: %2 - code_USER
+:: %3 - режим (например, debug)

-set defines=-D"STM32F103xB" -D"USE_HAL_DRIVER"^
- -D"MATLAB"^
- -D"__sizeof_ptr=8"
+:: Аргументы:
+:: %1 — includes строка (в кавычках)
+:: %2 — sources строка
+:: %3 — defines строка
+:: %4 — режим компиляции (debug/release)
+
+:: Сохраняем как переменные
+set filename=%~1
+set includes_USER=%~2
+set code_USER=%~3
+set defines_USER=%~4
+set defines_CONFIG=%~5
+set compil_mode=%~6
+
+:: Заменяем __EQ__ на =
+set defines_USER=%defines_USER:__EQ__==%
+set defines_CONFIG=%defines_CONFIG:__EQ__==%
+
+
+set defines_WRAPPER=-D"MATLAB"^ -D"__sizeof_ptr=8"
 :: -------------------------USERS PATHS AND CODE---------------------------
-set includes_USER= -I"..\mcu_project\upp\Core\Inc" -I"..\mcu_project\upp\Core\upp"
-
-set code_USER=.\App_Wrapper\main.c^
- .\App_Wrapper\app_io.c^
- ..\mcu_project\upp\Core\Src\gpio.c^
- ..\mcu_project\upp\Core\Src\adc.c^
- ..\mcu_project\upp\Core\Src\tim.c^
- ..\mcu_project\upp\Core\Src\stm32f1xx_hal_msp.c^
- ..\mcu_project\upp\Core\Src\stm32f1xx_it.c^
- ..\mcu_project\upp\Core\Src\system_stm32f1xx.c^
- ..\mcu_project\upp\Core\upp\upp.c^
- ..\mcu_project\upp\Core\upp\zero_cross.c^
- ..\mcu_project\upp\Core\upp\adc_filter.c^
- ..\mcu_project\upp\Core\upp\tiristor.c
-::-------------------------------------------------------------------------
-
-
-:: -----------------------MCU LIBRARIES & SIMULATOR------------------------
-:: -----MCU LIBRARIES STUFF----
-:: заголовочные файлы
-set includes_MCU= -I".\MCU_STM32F1xx_Matlab"^
- -I".\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK"^
- -I".\MCU_STM32F1xx_Matlab\Drivers\CMSIS"^
- -I".\MCU_STM32F1xx_Matlab\Drivers\CMSIS\Device\STM32F1xx"^
- -I".\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Inc"^
- -I".\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy"
-  
-:: код библиотек МК, переделанный для матлаб
-set code_MCU= .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.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_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_dma.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_exti.c
-
-:: .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ramfunc.c^
-:: .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash.c^
-:: .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_flash_ex.c^
-:: .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc_ex.c^
-
-:: --------MCU SIMULATOR-------
-:: код, которая будет симулировать перефирию МК в симулинке
-set code_MCU_Sim= .\MCU_STM32F1xx_Matlab\stm32f1xx_matlab_conf.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_matlab_gpio.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_matlab_tim.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_periph_registers.c 
 ::-------------------------------------------------------------------------


 :: -------------------------WRAPPER PATHS AND CODE---------------------------
 :: оболочка, которая будет моделировать работу МК в симулинке
-set includes_WRAPPER= -I".\MCU_Wrapper"
-set code_WRAPPER= .\MCU_Wrapper\MCU.c^
+:: WRAPPER BAT START
+set code_WRAPPER=.\MCU_Wrapper\MCU.c^
 .\MCU_Wrapper\mcu_wrapper.c
+
+set includes_WRAPPER= -I".\MCU_Wrapper\"
+:: WRAPPER BAT END
+
+:: APP WRAPPER BAT START
+set code_APP_WRAPPER=.\app_wrapper\app_wrapper.c^
+ .\app_wrapper\app_init.c^
+ .\app_wrapper\app_io.c
+
+set includes_APP_WRAPPER= -I".\app_wrapper\"
+:: APP WRAPPER BAT END
+
+set includes_WRAPPER= %includes_WRAPPER% %includes_APP_WRAPPER%
+set code_WRAPPER= %code_WRAPPER% %code_APP_WRAPPER%
+
+
+:: PERIPH BAT START
+set code_PERIPH=.\MCU_STM32F1xx_Matlab\stm32f1xx_matlab_conf.c^
+ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_matlab_gpio.c^
+ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_periph_registers.c^
+ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.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_cortex.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_HAL_Driver\Src\stm32f1xx_hal_gpio.c^
+ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio_ex.c^
+ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c^
+ .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.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_SIMULINK\stm32f1xx_matlab_tim.c
+
+set includes_PERIPH=-I".\MCU_STM32F1xx_Matlab\."^
+ -I".\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK"^
+ -I".\MCU_STM32F1xx_Matlab\Drivers\CMSIS"^
+ -I".\MCU_STM32F1xx_Matlab\Drivers\CMSIS\Device\STM32F1xx"^
+ -I".\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Inc"^
+ -I".\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Inc\Legacy"
+:: PERIPH BAT END
 ::-------------------------------------------------------------------------


 :: ---------------------SET PARAMS FOR MEX COMPILING-----------------------
-:: --------ALL INCLUDES--------
-set includes= %includes_USER% %includes_MCU% %includes_WRAPPER%
-set codes= %code_WRAPPER% %code_USER% %code_MCU% %code_MCU_Sim%
+:: -------------ALL------------
+set includes= %includes_WRAPPER% %includes_PERIPH% %includes_USER%
+set codes= %code_WRAPPER% %code_PERIPH% %code_USER%
+set defines= %defines_WRAPPER% %defines_CONFIG% %defines_USER%
 :: -------OUTPUT FOLDER--------
-set output= -outdir "."
+set output= -outdir "." -output %filename%

-:: если нужен дебаг, до запускаем run mex с припиской debug
-IF [%1]==[debug] (set debug= -g)
+:: если нужен дебаг, до запускаем run_mex с припиской debug
+IF %compil_mode%==debug (set debug= -g)
 ::-------------------------------------------------------------------------


 ::------START COMPILING-------    
-echo Compiling...
+if "%7"=="echo_enable" (
+    echo Compiling...
+
+    echo ===========================
+    echo =========INCLUDES==========
+    echo USER:
+    for %%f in (%includes_USER%) do (
+        echo   %%f
+    )
+    echo INTERNAL:
+    for %%f in (%includes_WRAPPER%) do (
+        echo   %%f
+    )
+    echo PERIPH:
+    for %%f in (%includes_PERIPH%) do (
+        echo   %%f
+    )
+
+    echo ===========================
+    echo ==========SOURCES==========
+    echo USER:
+    for %%f in (%code_USER%) do (
+        echo   %%f
+    )
+    echo INTERNAL:
+    for %%f in (%code_WRAPPER%) do (
+        echo   %%f
+    )
+    echo PERIPH:
+    for %%f in (%code_PERIPH%) do (
+        echo   %%f
+    )
+
+    echo ===========================
+    echo ==========DEFINES==========
+    echo USER:
+    for %%d in (%defines_USER%) do (
+        echo   %%d
+    )
+    echo CONFIG:
+    for %%f in (%defines_CONFIG%) do (
+        echo   %%f
+    )
+    echo INTERNAL:
+    for %%f in (%defines_WRAPPER%) do (
+        echo   %%f
+    )
+)
+echo ===========================
+echo MODE: %compil_mode%
+echo ===========================
 mex %output% %defines% %includes% %codes% %debug%
 echo %DATE% %TIME%
+exit /b %ERRORLEVEL%
--- a/app_wrapper/app_configs.h
+++ b/app_wrapper/app_configs.h
@@ -0,0 +1,10 @@
+/**
+**************************************************************************
+* @file app_config.h
+* @brief Заголовочный файл для пользовательских конфигураций.
+**************************************************************************/
+#ifndef _APP_CONFIG
+#define _APP_CONFIG
+
+
+#endif //_APP_CONFIG
--- a/app_wrapper/app_includes.h
+++ b/app_wrapper/app_includes.h
@@ -0,0 +1,18 @@
+/**
+**************************************************************************
+* @file app_includes.h
+* @brief Заголовочный файл для подключаения заголовочных файлов программы МК.
+**************************************************************************/
+#ifndef _APP_INCLUDES_H_
+#define _APP_INCLUDES_H_
+
+#include "app_configs.h"
+
+// INCLUDES START
+// Инклюды для доступа к коду МК в коде оболочке
+//#include "stm32f1xx_matlab_conf.h"
+#include "upp.h"
+#include "main.h"
+// INCLUDES END
+
+#endif //_APP_INCLUDES_H_
--- a/app_wrapper/app_init.c
+++ b/app_wrapper/app_init.c
@@ -0,0 +1,38 @@
+/**
+**************************************************************************
+* @file app_init.h
+* @brief Файл с функцией инициализации программы МК @ref app_init.
+**************************************************************************/
+#include "mcu_wrapper_conf.h"
+#include "app_wrapper.h"
+
+/**
+  * @brief Функция для инициализации приложения МК
+  * @details Используется в случае симуляции без отдельного потока для main().
+  */
+void app_init(void) {
+// USER APP INIT START
+// Код для инициализации приложения МК
+//
+// Вызов разных функций в случае, 
+// если не используется отдельный поток для main().
+HAL_Init();
+MX_GPIO_Init();
+MX_TIM2_Init();
+upp_init();
+// USER APP INIT END
+}
+
+
+/**
+  * @brief Функция для деинициализации приложения МК
+  */
+void app_deinit(void) {
+// USER APP DEINIT START
+// Код для деинициализации приложения МК
+//
+// Структуры, переменные и так далее, которые надо очистить,
+// для повторного запуска симуляции.
+deInitialize_MCU();
+// USER APP DEINIT END
+}
--- a/app_wrapper/app_io.c
+++ b/app_wrapper/app_io.c
@@ -0,0 +1,100 @@
+/**
+**************************************************************************
+* @file app_init.h
+* @brief Файл с функциями записи входов/выходов программы МК @ref app_init.
+**************************************************************************/
+#include "mcu_wrapper_conf.h"
+#include "app_wrapper.h"
+
+/**
+  * @brief Функция для записи входов в приложение МК
+  * @param u - массив входных значений
+  */
+void app_readInputs(const real_T* Buffer) {
+// USER APP INPUT START
+#define detect_front(_in_numb_, _var_, _val_) {                 \
+if ((Buffer[_in_numb_] > 0.5) && (prev_in[_in_numb_] <= 0.5))   \
+{                                                               \
+    _var_ = _val_;                                              \
+} }
+
+#define detect_rise(_in_numb_, _var_, _val_) {                  \
+if ((Buffer[_in_numb_] < 0.5) && (prev_in[_in_numb_] >= 0.5))   \
+{                                                               \
+    _var_ = _val_;                                              \
+} }
+
+    static real_T prev_in[TOTAL_IN_SIZE];
+
+    detect_front(0, phase_A.zc_detector.f.EXTIZeroCrossDetected, 1);
+    detect_rise(0, phase_A.zc_detector.f.EXTIZeroCrossDetected, 1);
+
+    detect_front(1, phase_B.zc_detector.f.EXTIZeroCrossDetected, 1);
+    detect_rise(1, phase_B.zc_detector.f.EXTIZeroCrossDetected, 1);
+
+    detect_front(2, phase_C.zc_detector.f.EXTIZeroCrossDetected, 1);
+    detect_rise(2, phase_C.zc_detector.f.EXTIZeroCrossDetected, 1);
+
+    detect_front(3, Upp.GoSafe, 1);
+    detect_rise(3, Upp.GoSafe, 0);
+
+    detect_front(4, Upp.Prepare, 1);
+    detect_rise(4, Upp.Prepare, 0);
+
+    detect_front(5, Upp.ForceStop, 1);
+    detect_rise(5, Upp.ForceStop, 0);
+
+    detect_front(6, Upp.ForceDisconnect, 1);
+    detect_rise(6, Upp.ForceDisconnect, 0);
+
+
+    Upp.sine_freq = Buffer[7];
+    Upp.Duration = Buffer[8];
+
+
+    for (int i = 0; i < TOTAL_IN_SIZE; i++)
+    {
+        prev_in[i] = Buffer[i];
+    }
+// USER APP INPUT END
+}
+
+/**
+  * @brief Функция для записи выходов приложения МК
+  * @param xD - массив буффера выходов(дискретных выходов)
+  * @details Используте WriteOutputArray(val, arr_ind, val_ind) для записи
+  */
+void app_writeOutputBuffer(real_T* Buffer) {
+// USER APP OUTPUT START
+
+    for (int i = 0; i < 16; i++)
+    {
+        if (GPIOA->ODR & (1 << i))
+        {
+            WriteOutputArray(1, 0, i);
+        }
+        else
+        {
+            WriteOutputArray(0, 0, i);
+        }
+
+        if (GPIOB->ODR & (1 << i))
+        {
+            WriteOutputArray(1, 1, i);
+        }
+        else
+        {
+            WriteOutputArray(0, 1, i);
+        }
+    }
+
+int var = phase_A.ctrl.angle.delay_us;
+WriteOutputArray(var, 2, 0);
+var = (uint16_t)((uint16_t)TIMER->CNT - phase_A.ctrl.angle.start_delay_tick);
+WriteOutputArray(var, 2, 1);
+var = phase_A.ctrl.angle.start_delay_tick;
+WriteOutputArray(var, 2, 2);
+var = TIMER->CNT;
+WriteOutputArray(var, 2, 3);
+// USER APP OUTPUT END
+}
--- a/app_wrapper/app_wrapper.c
+++ b/app_wrapper/app_wrapper.c
@@ -0,0 +1,26 @@
+#include "mcu_wrapper_conf.h"
+#include "app_wrapper.h"
+
+
+/**
+  * @brief Функция для симуляции шага приложения МК
+  * @details Используется в случае симуляции без отдельного потока для main().
+  */
+void app_step(void)
+{
+// USER APP STEP START
+
+uwTick = hmcu.SystemClock / (MCU_CORE_CLOCK / 1000);
+
+upp_main();
+// USER APP STEP END
+}
+
+
+// DUMMY START
+// Заглушки для различных функций и переменных
+
+uint32_t HAL_RCCEx_GetPeriphCLKFreq(uint32_t PeriphClk) {}
+void SystemClock_Config(void) {}
+void Error_Handler(void) {}
+// DUMMY END
--- a/app_wrapper/app_wrapper.h
+++ b/app_wrapper/app_wrapper.h
@@ -0,0 +1,12 @@
+#ifndef _APP_WRAPPER_H_
+#define _APP_WRAPPER_H_
+
+#include "app_includes.h"
+
+void app_step(void);
+void app_init(void);
+void app_deinit(void);
+void app_readInputs(const real_T* u);
+void app_writeOutputBuffer(real_T* xD);
+
+#endif //_APP_WRAPPER_H_
--- a/mcu_test_r2021.slx
+++ b/mcu_test_r2021.slx
--- a/mcu_test_r2021.slx.r2021a
+++ b/mcu_test_r2021.slx.r2021a
--- a/mcu_test_r2021b.slx
+++ b/mcu_test_r2021b.slx
--- a/mcu_test_r2023.slx
+++ b/mcu_test_r2023.slx
--- a/mexing.m
+++ b/mexing.m
@@ -1,19 +0,0 @@
-% Компилирует S-function
-clear, clc,
-
-set = mex.getCompilerConfigurations('C', 'Selected');
-
-Ts = 0.00001;
-
-delete("*.mexw64")
-delete("*.mexw64.pdb")
-delete(".\MCU_Wrapper\Outputs\*.*");
-
-status=system('.\MCU_Wrapper\run_mex.bat debug');
-
-if status==0
-    beep
-else
-    error('Error!');
-end
-
Author	SHA1	Message	Date
Razvalyaev	e0ba383b8d	добавлен конфиг для мейн параметров, плюс восстановлена колво портов модели	2025-06-17 18:36:48 +03:00
Razvalyaev	2cfd952cbc	тесты	2025-06-16 08:23:01 +03:00
Razvalyaev	a1a05d823c	работает формирование сурсов и инклюдов по конфигу	2025-06-15 23:38:54 +03:00
Razvalyaev	343d07cbf9	убраны лишние сурсы в конфиге но пока нчиего не работает	2025-06-15 16:48:28 +03:00
Razvalyaev	f950785327	добавлено авторазмешение элементов на маске периферии	2025-06-15 16:02:36 +03:00
Razvalyaev	10e831c4b5	сделана конфигурация hal в маске	2025-06-15 15:16:01 +03:00
Razvalyaev	41411cb0d4	обновлены модели для 2023 и 2021 матлаба	2025-06-15 02:59:50 +03:00
Razvalyaev	e7e0884c09	запустилось... но симуляцию периферии надо переделывать, работает непойми как	2025-06-15 02:42:02 +03:00
Razvalyaev	0f3ac734bf	переношу проект пока не работает	2025-06-15 02:07:12 +03:00
Razvalyaev	5e93fc2099	это. просто. ахуено. конфиги работают можно делать окно настроек для симуляции периферии мб конечно причесать это все потом, но это потом	2025-06-12 21:43:34 +03:00
Razvalyaev	0a4a87038e	чуть ранее работало идеально, но ща решил сделать парс конфига по вкладкам	2025-06-12 19:54:41 +03:00
Razvalyaev	ead46d7d82	переделана структура задавания дефайнов теперь для дефайна используется альтернативное имя alias. и есть функция, которая выставляет дефайн по chekcbox/edit и его альтернативной функции для конфигов такая механика тоже реализована - и она работает	2025-06-12 12:08:34 +03:00
Razvalyaev	a6c5a9edab	конфиги считываются	2025-06-12 10:51:26 +03:00
Razvalyaev	fffd725d91	тест конфигов (пока не работает)	2025-06-12 07:48:50 +03:00
Razvalyaev	99ec69324d	что-то возможно подписаны оси	2025-06-09 23:59:21 +03:00
Razvalyaev	59b4f9cffc	сделано расширенное эхо в консоли по кнопку	2025-06-09 22:44:49 +03:00
Razvalyaev	63ce872689	добавлена проверка findjobj для чекбокса внешней консоли	2025-06-09 10:48:18 +03:00
Razvalyaev	e80725d9cf	сделаны относительные пути	2025-06-09 10:39:53 +03:00
Razvalyaev	47365da124	сделан редактор кода оболочки прямо в маске	2025-06-09 10:14:42 +03:00
Razvalyaev	25da0591b4	доделан выбор потока из маски сделан вывод в внешнюю терминалку (по выбору)	2025-06-09 08:22:16 +03:00
Razvalyaev	3a14a5c252	Начата работа над GUI для симулятора: - выставление настроек компиляции - задание исходников и путей для компиляции	2025-06-08 20:16:55 +03:00
Razvalyaev	70e524f041	добавлено график для сравнение с реал мк	2025-06-07 18:38:22 +03:00
Razvalyaev	082e27dde5	добавлена симулинк модель для 2021	2025-05-18 18:05:22 +03:00
Razvalyaev	dc84b068d6	minor	2025-05-16 15:26:20 +03:00