diff --git 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
new file mode 100644
index 0000000..b29f8ee
--- /dev/null
+++ 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
+      },
\ No newline at end of file
diff --git a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json
index 263f7ba..5a3525a 100644
--- a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json
+++ b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json
@@ -1,5 +1,5 @@
 {
-  "Code": {
+  "MainCode": {
     "Sources": {
       "Type": "files",
       "Options": [
@@ -10,20 +10,14 @@
         "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c",
         "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c",
         "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c",
         "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c",
-        "stm32f1xx_matlab_conf.c",
-        "Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.c",
-        "Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.c",
-        "Drivers/STM32F1xx_SIMULINK/stm32f1xx_periph_registers.c"
+        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c"
       ]
     },
     "Includes": {
       "Type": "paths",
       "Options": [
-        "",
+        ".",
         "Drivers/STM32F1xx_SIMULINK",
         "Drivers/CMSIS",
         "Drivers/CMSIS/Device/STM32F1xx",
@@ -52,6 +46,375 @@
       }
     }
   },
+  "Main": {
+    "Sources": {
+      "Type": "files",
+      "Options": [
+        "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": true,
+        "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,
+        "NewRow": false
+      },
+      "HAL_CAN": {
+        "Prompt": "Enable HAL CAN Module",
+        "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",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can_legacy.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "HAL_CEC": {
+        "Prompt": "Enable HAL CEC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cec.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_CORTEX": {
+        "Prompt": "Enable HAL CORTEX Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c"
+        ],
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": false
+      },
+      "HAL_CRC": {
+        "Prompt": "Enable HAL CRC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "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,
+        "NewRow": false
+      },
+      "HAL_DMA": {
+        "Prompt": "Enable HAL DMA Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_ETH": {
+        "Prompt": "Enable HAL ETH Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_eth.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "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,
+        "NewRow": false
+      },
+      "HAL_EXTI": {
+        "Prompt": "Enable HAL EXTI Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c"
+        ],
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": false
+      },
+      "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,
+        "NewRow": true
+      },
+      "HAL_I2C": {
+        "Prompt": "Enable HAL I2C Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_I2S": {
+        "Prompt": "Enable HAL I2S Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2s.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_IRDA": {
+        "Prompt": "Enable HAL IRDA Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_irda.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "HAL_IWDG": {
+        "Prompt": "Enable HAL IWDG Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_NOR": {
+        "Prompt": "Enable HAL NOR Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nor.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_NAND": {
+        "Prompt": "Enable HAL NAND Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_nand.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "HAL_PCCARD": {
+        "Prompt": "Enable HAL PCCARD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pccard.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": 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,
+        "NewRow": false
+      },
+      "HAL_HCD": {
+        "Prompt": "Enable HAL HCD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_hcd.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "HAL_PWR": {
+        "Prompt": "Enable HAL PWR Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c"
+        ],
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": false
+      },
+      "HAL_RCC": {
+        "Prompt": "Enable HAL RCC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c",
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c"
+        ],
+        "Type": "checkbox",
+        "Default": true,
+        "NewRow": false
+      },
+      "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,
+        "NewRow": true
+      },
+      "HAL_SD": {
+        "Prompt": "Enable HAL SD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sd.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_MMC": {
+        "Prompt": "Enable HAL MMC Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_mmc.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_SDRAM": {
+        "Prompt": "Enable HAL SDRAM Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sdram.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "HAL_SMARTCARD": {
+        "Prompt": "Enable HAL SMARTCARD Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_smartcard.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_SPI": {
+        "Prompt": "Enable HAL SPI Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_SRAM": {
+        "Prompt": "Enable HAL SRAM Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_sram.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "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,
+        "NewRow": false
+      },
+      "HAL_UART": {
+        "Prompt": "Enable HAL UART Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      },
+      "HAL_USART": {
+        "Prompt": "Enable HAL USART Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_usart.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": true
+      },
+      "HAL_WWDG": {
+        "Prompt": "Enable HAL WWDG Module",
+        "Sources": [
+          "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_wwdg.c"
+        ],
+        "Type": "checkbox",
+        "Default": false,
+        "NewRow": false
+      }
+    }
+  },
   "RCC": {
     "Defines": {
       "HCLK_Clock": {
@@ -92,6 +455,9 @@
     }
   },
   "TIM": {
+    "Sources": [
+      "Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_tim.c"
+    ],
     "Defines": {
       "TIM1_Enable": {
         "Prompt": "TIM1 Enable",
@@ -100,118 +466,6 @@
         "Default": false,
         "NewRow": true
       },
-      "TIM1_UP_TIM10_Handler": {
-        "Prompt": "TIM1_UP_TIM10 Handler",
-        "Def": "USE_TIM1_UP_TIM10_HANDLER",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": false
-      },
-      "TIM2_Enable": {
-        "Prompt": "TIM2 Enable",
-        "Def": "USE_TIM2",
-        "Type": "checkbox",
-        "Default": true,
-        "NewRow": true
-      },
-      "TIM2_Handler": {
-        "Prompt": "TIM2 Handler",
-        "Def": "USE_TIM2_HANDLER",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": false
-      },
-      "TIM3_Enable": {
-        "Prompt": "TIM3 Enable",
-        "Def": "USE_TIM3",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": true
-      },
-      "TIM3_Handler": {
-        "Prompt": "TIM3 Handler",
-        "Def": "USE_TIM3_HANDLER",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": false
-      },
-      "TIM4_Enable": {
-        "Prompt": "TIM4 Enable",
-        "Def": "USE_TIM4",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": true
-      },
-      "TIM4_Handler": {
-        "Prompt": "TIM4 Handler",
-        "Def": "USE_TIM4_HANDLER",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": false
-      },
-      "TIM5_Enable": {
-        "Prompt": "TIM5 Enable",
-        "Def": "USE_TIM5",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": true
-      },
-      "TIM5_Handler": {
-        "Prompt": "TIM5 Handler",
-        "Def": "USE_TIM5_HANDLER",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": false
-      },
-      "TIM6_Enable": {
-        "Prompt": "TIM6 Enable",
-        "Def": "USE_TIM6",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": true
-      },
-      "TIM6_Handler": {
-        "Prompt": "TIM6 Handler",
-        "Def": "USE_TIM6_HANDLER",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": false
-      },
-      "TIM7_Enable": {
-        "Prompt": "TIM7 Enable",
-        "Def": "USE_TIM7",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": true
-      },
-      "TIM7_Handler": {
-        "Prompt": "TIM7 Handler",
-        "Def": "USE_TIM7_HANDLER",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": false
-      },
-      "TIM8_Enable": {
-        "Prompt": "TIM8 Enable",
-        "Def": "USE_TIM8",
-        "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
-      },
-      "TIM9_Enable": {
-        "Prompt": "TIM9 Enable",
-        "Def": "USE_TIM9",
-        "Type": "checkbox",
-        "Default": false,
-        "NewRow": true
-      },
       "TIM1_BRK_TIM9_Handler": {
         "Prompt": "TIM1_BRK_TIM9 Handler",
         "Def": "USE_TIM1_BRK_TIM9_HANDLER",
@@ -219,16 +473,23 @@
         "Default": false,
         "NewRow": false
       },
-      "TIM10_Enable": {
-        "Prompt": "TIM10 Enable",
-        "Def": "USE_TIM10",
+      "TIM2_Enable": {
+        "Prompt": "TIM2 Enable",
+        "Def": "USE_TIM2",
         "Type": "checkbox",
-        "Default": false,
+        "Default": true,
         "NewRow": true
       },
-      "TIM11_Enable": {
-        "Prompt": "TIM11 Enable",
-        "Def": "USE_TIM11",
+      "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
@@ -240,9 +501,93 @@
         "Default": false,
         "NewRow": false
       },
-      "TIM12_Enable": {
-        "Prompt": "TIM12 Enable",
-        "Def": "USE_TIM12",
+      "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
@@ -254,6 +599,34 @@
         "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",
@@ -267,13 +640,6 @@
         "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
       }
     }
   },
diff --git a/MCU_Wrapper/run_mex.bat b/MCU_Wrapper/run_mex.bat
index fab74e4..3c6a052 100644
--- a/MCU_Wrapper/run_mex.bat
+++ b/MCU_Wrapper/run_mex.bat
@@ -30,34 +30,46 @@ set defines_WRAPPER=-D"MATLAB"^ -D"__sizeof_ptr=8"
 
 :: -------------------------WRAPPER PATHS AND CODE---------------------------
 :: оболочка, которая будет моделировать работу МК в симулинке
-set includes_WRAPPER=-I"."^
- -I".\MCU_Wrapper"^
- -I".\app_wrapper"
+:: WRAPPER BAT START
+set code_WRAPPER=.\MCU_Wrapper\MCU.c^
+ .\MCU_Wrapper\mcu_wrapper.c
 
-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^
- .\app_wrapper\app_wrapper.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\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c^
+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_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_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\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
+ .\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
 
-set includes_PERIPH=-I".\MCU_STM32F1xx_Matlab"^
+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"^
diff --git a/mcu_test_r2021.slx b/mcu_test_r2021.slx
index 50db228..44f98f5 100644
Binary files a/mcu_test_r2021.slx and b/mcu_test_r2021.slx differ
diff --git a/mcu_test_r2021.slx.r2021a b/mcu_test_r2021.slx.r2021a
new file mode 100644
index 0000000..50db228
Binary files /dev/null and b/mcu_test_r2021.slx.r2021a differ
diff --git a/mcu_test_r2023.slx b/mcu_test_r2023.slx
index a03e8a8..5e34725 100644
Binary files a/mcu_test_r2023.slx and b/mcu_test_r2023.slx differ