diff --git a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json index 96e31f5..4dad554 100644 --- a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json +++ b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json @@ -24,14 +24,11 @@ } }, "Main": { - "Sources": { - "Type": "files", - "Options": [ - "stm32f1xx_matlab_conf.c", - "Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.c", - "Drivers/STM32F1xx_SIMULINK/stm32f1xx_periph_registers.c" - ] - }, + "Sources": [ + "stm32f1xx_matlab_conf.c", + "Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.c", + "Drivers/STM32F1xx_SIMULINK/stm32f1xx_periph_registers.c" + ], "Defines": { "STM32xx": { "Prompt": "Choose MCU", @@ -115,7 +112,7 @@ "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c" ], "Type": "checkbox", - "Default": true + "Default": false }, "HAL_CRC": { "Prompt": "Enable HAL CRC Module", @@ -260,8 +257,7 @@ "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" + "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c" ], "Type": "checkbox", "Default": true diff --git a/MCU_Wrapper/run_mex.bat b/MCU_Wrapper/run_mex.bat index d137726..6847946 100644 --- a/MCU_Wrapper/run_mex.bat +++ b/MCU_Wrapper/run_mex.bat @@ -50,7 +50,22 @@ set code_WRAPPER= %code_WRAPPER% %code_APP_WRAPPER% :: PERIPH BAT START -set code_PERIPH=.\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_matlab_tim.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_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"^ diff --git a/mcu_test_r2023.slx b/mcu_test_r2023.slx index e828fb2..0ecc2e9 100644 Binary files a/mcu_test_r2023.slx and b/mcu_test_r2023.slx differ