что-то

возможно подписаны оси
сделано расширенное эхо в консоли по кнопку
2025-06-09 23:59:21 +03:00 · 2025-06-09 22:44:49 +03:00 · 2025-06-09 10:48:18 +03:00 · 2025-06-09 10:39:53 +03:00 · 2025-06-09 10:14:42 +03:00 · 2025-06-09 08:22:16 +03:00
14 changed files with 568 additions and 298 deletions
--- a/App_Wrapper/app_io.c
+++ b/App_Wrapper/app_io.c
@@ -1,65 +0,0 @@
-#include "stm32f1xx_matlab_gpio.h"
-#include "upp.h"
-
-
-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.f.EnableTiristor;
-    disc[2 * PORT_WIDTH + 1] = phase_A.ctrl.f.TiristorIsEnable;
-    disc[2 * PORT_WIDTH + 2] = uwTick - phase_A.ctrl.enable_start_tick;
-    disc[2 * PORT_WIDTH + 3] = phase_A.ctrl.angle.start_delay_us;
-    disc[2 * PORT_WIDTH + 4] = (uint16_t)((uint16_t)TIMER->CNT - phase_A.ctrl.angle.start_delay_us);
-}
-
-
-
-void ReadToSFunc(real_T* in)
-{
-    static real_T in_prev[3];
-
-    if ((in[0] > 0.5) && (in_prev[0] <= 0.5))
-    {
-        phase_A.zc_detector.f.EXTIZeroCrossDetected = 1;
-    }
-    else if ((in[0] < 0.5) && (in_prev[0] >= 0.5))
-    {
-        phase_A.zc_detector.f.EXTIZeroCrossDetected = 1;
-    }
-
-
-    if ((in[1] > 0.5) && (in_prev[1] <= 0.5))
-    {
-        phase_B.zc_detector.f.EXTIZeroCrossDetected = 1;
-    }
-    else if ((in[1] < 0.5) && (in_prev[1] >= 0.5))
-    {
-        phase_B.zc_detector.f.EXTIZeroCrossDetected = 1;
-    }
-
-
-    if ((in[2] > 0.5) && (in_prev[2] <= 0.5))
-    {   
-        phase_C.zc_detector.f.EXTIZeroCrossDetected = 1;
-    }
-    else if ((in[2] < 0.5) && (in_prev[2] >= 0.5))
-    {
-        phase_C.zc_detector.f.EXTIZeroCrossDetected = 1;
-    }
-
-    in_prev[0] = in[0];
-    in_prev[1] = in[1];
-    in_prev[2] = in[2];
-}
--- 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_SIMULINK/stm32f1xx_matlab_gpio.h
+++ b/MCU_STM32F1xx_Matlab/Drivers/STM32F1xx_SIMULINK/stm32f1xx_matlab_gpio.h
@@ -17,7 +17,5 @@


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

 #endif // _MATLAB_GPIO_H_
--- a/MCU_Wrapper/MCU.c
+++ b/MCU_Wrapper/MCU.c
@@ -185,8 +185,10 @@ static void mdlInitializeSampleTimes(SimStruct* S)
 static void mdlTerminate(SimStruct* S)
 {
 	hmcu.fMCU_Stop = 1;
+#ifdef RUN_APP_MAIN_FUNC_THREAD
 	ResumeThread(hmcu.hMCUThread);
 	WaitForSingleObject(hmcu.hMCUThread, 10000);
+#endif
 	SIM_deInitialize_Simulation();
 	mexUnlock();
 }
--- a/MCU_Wrapper/app_wrapper.c
+++ b/MCU_Wrapper/app_wrapper.c
@@ -0,0 +1,138 @@
+/**
+**************************************************************************
+* @file app_wrapper.c
+* @brief Код для из приложения МК для симуляции.
+**************************************************************************
+**************************************************************************/
+
+#include "mcu_wrapper_conf.h"
+// Includes START
+#include "upp.h"
+#include "main.h"
+// Inlcudes END
+
+// Dummy functions START
+uint32_t HAL_RCCEx_GetPeriphCLKFreq(uint32_t PeriphClk) {}
+void SystemClock_Config(void) {}
+void Error_Handler(void) {}
+// Dummy functions END
+
+void app_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 */
+}
+
+
+void app_step(void)
+{
+    upp_main();
+}
+
+void app_writeOutputBuffer(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)((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 app_readInputs(real_T* in)
+{
+
+#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_;                                          \
+} }
+
+    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/MCU_Wrapper/findjobj.mltbx
+++ b/MCU_Wrapper/findjobj.mltbx
--- a/MCU_Wrapper/mcu_wrapper.c
+++ b/MCU_Wrapper/mcu_wrapper.c
@@ -58,14 +58,14 @@ void MCU_Step_Simulation(SimStruct* S, time_T time)

    MCU_Periph_Simulation(); // 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)
@@ -94,7 +94,7 @@ void MCU_readInputs(SimStruct* S)
    /* Get S-Function inputs */
    real_T* IN = ssGetInputPortRealSignal(S, 0);

-    ReadToSFunc(IN);
+    app_readInputs(IN);
 }

 /* WRITE OUTPUTS BUFFER S-FUNCTION FROM MCU REGS*/
@@ -108,8 +108,8 @@ void MCU_writeOutputs(SimStruct* S)
    /* Get S-Function descrete array */
    real_T* Out_Buff = ssGetDiscStates(S);

-    //Simulate_GPIO_BSRR();
-    WriteFromSFunc(Out_Buff);
+    Simulate_GPIO_BSRR();
+    app_writeOutputBuffer(Out_Buff);
 }
 //-----------------CONTROLLER SIMULATE FUNCTIONS---------------//
 //-------------------------------------------------------------//
@@ -152,13 +152,14 @@ void SIM_Initialize_Simulation(void)
 #ifdef RUN_APP_MAIN_FUNC_THREAD
    // инициализация потока, который будет выполнять код МК
    hmcu.hMCUThread = (HANDLE)CreateThread(NULL, 0, MCU_App_Thread, 0, CREATE_SUSPENDED, &hmcu.idMCUThread);
+#else
+    extern int app_init(void);
+    app_init();
 #endif //RUN_APP_MAIN_FUNC_THREAD

    /* user initialization */
    Initialize_Periph_Sim();

-    extern int main_init(void);
-    main_init();
    /* wrapper initialization */
    hmcu.SystemClock_step = MCU_CORE_CLOCK * hmcu.SIM_Sample_Time;   // set system clock step
 }
@@ -169,9 +170,13 @@ void SIM_Initialize_Simulation(void)
  */
 void SIM_deInitialize_Simulation(void)
 {
+//#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
 }
 //-------------------------------------------------------------//
--- a/MCU_Wrapper/mcu_wrapper_conf.h
+++ b/MCU_Wrapper/mcu_wrapper_conf.h
@@ -45,15 +45,18 @@

        // 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      0xFF      ///< number of for() cycles after which MCU thread would be suspended 
+//#define MCU_CORE_CLOCK                  72000000
+
+
+//#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           (3)                         ///< width of input ports
+#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
@@ -149,9 +152,11 @@ void SIM_deInitialize_Simulation(void);

 /* Read inputs S-function  */
 void MCU_readInputs(SimStruct* S);
+void app_readInputs(real_T* in);

 /* Write pre-outputs S-function (out_buff states) */
 void MCU_writeOutputs(SimStruct* S);
+void app_writeOutputBuffer(real_T* disc);

 /* Write outputs of block of S-Function*/
 void SIM_writeOutput(SimStruct* S);
--- a/MCU_Wrapper/run_mex.bat
+++ b/MCU_Wrapper/run_mex.bat
@@ -1,23 +1,28 @@
@echo off
+:: Получаем аргументы из командной строки
+:: %1 - includes_USER
+:: %2 - code_USER
+:: %3 - режим (например, debug)
+
+:: Аргументы:
+:: %1 — includes строка (в кавычках)
+:: %2 — sources строка
+:: %3 — defines строка
+:: %4 — режим компиляции (debug/release)
+
+:: Сохраняем как переменные
+set includes_USER=%~1
+set code_USER=%~2
+set defines_USER=%~3
+set compil_mode=%~4
+
+:: Заменяем __EQ__ на =
+set defines_USER=%defines_USER:__EQ__==%
+
+
+set defines_WRAPPER=-D"MATLAB"^ -D"__sizeof_ptr=8"

-set defines=-D"STM32F103xB" -D"USE_HAL_DRIVER"^
- -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
 ::-------------------------------------------------------------------------


@@ -62,7 +67,8 @@ set code_MCU_Sim= .\MCU_STM32F1xx_Matlab\stm32f1xx_matlab_conf.c^
 :: оболочка, которая будет моделировать работу МК в симулинке
 set includes_WRAPPER= -I".\MCU_Wrapper"
 set code_WRAPPER= .\MCU_Wrapper\MCU.c^
- .\MCU_Wrapper\mcu_wrapper.c
+ .\MCU_Wrapper\mcu_wrapper.c^
+ .\MCU_Wrapper\app_wrapper.c
 ::-------------------------------------------------------------------------


@@ -70,14 +76,64 @@ set code_WRAPPER= .\MCU_Wrapper\MCU.c^
 :: --------ALL INCLUDES--------
 set includes= %includes_USER% %includes_MCU% %includes_WRAPPER%
 set codes= %code_WRAPPER% %code_USER% %code_MCU% %code_MCU_Sim%
+set defines= %defines_USER% %defines_WRAPPER%
 :: -------OUTPUT FOLDER--------
 set output= -outdir "."

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


 ::------START COMPILING-------    
-echo Compiling...
+if "%5"=="echo_enable" (
+    echo Compiling...
+
+    echo ===========================
+    echo INCLUDES:
+    echo USER:
+    for %%f in (%includes_USER%) do (
+        echo   %%f
+    )
+    echo INTERNAL:
+    for %%f in (%includes_MCU%) do (
+        echo   %%f
+    )
+    for %%f in (%includes_WRAPPER%) 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
+    )
+    for %%f in (%code_MCU_Sim%) do (
+        echo   %%f
+    )
+    for %%f in (%code_MCU%) do (
+        echo   %%f
+    )
+
+    echo ===========================
+    echo DEFINES:
+    echo USER:
+    for %%d in (%defines_USER%) do (
+        echo   %%d
+    )
+    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%
--- a/mcu_test_r2021.slx
+++ b/mcu_test_r2021.slx
--- 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 +1,329 @@
 % Компилирует S-function
-clear, clc,
+clear, clc
+close;

-set = mex.getCompilerConfigurations('C', 'Selected');

-Ts = 0.000001;
+Ts = 0.00001;

 delete("*.mexw64")
 delete("*.mexw64.pdb")
 delete(".\MCU_Wrapper\Outputs\*.*");

-status=system('.\MCU_Wrapper\run_mex.bat debug');
+% Флаг режима отладки
+definesArg = buildDefinesString();
+definesUserArg = parseDefinesMaskText();
+definesAllArg = [definesArg + " " + definesUserArg];    

-if status==0
-    beep
+maskValues = get_param(gcbh, 'MaskValues');
+paramNames = get_param(gcbh, 'MaskNames');
+
+inxDebug = find(strcmp(paramNames, 'enableDebug'));
+idxExtConsole = find(strcmp(paramNames, 'extConsol'));
+idxFullOutput = find(strcmp(paramNames, 'fullOutput'));
+
+isDebug = maskValues{inxDebug};
+isExtConsole = maskValues{idxExtConsole};
+isFullOutput = maskValues{idxFullOutput};
+
+if strcmpi(isDebug, 'on')
+    modeArg = "debug";
 else
-    error('Error!');
+    modeArg = "release";
 end

+if strcmpi(isFullOutput, 'on')
+    echoArg = 'echo_enable';
+else
+    echoArg = 'echo_disable';
+
+end
+
+[includesArg, codeArg] = make_mex_arguments('incTable', 'srcTable');
+
+set_param(gcb, 'consoleOutput', '');
+% Вызов батника с двумя параметрами: includes и code
+cmd = sprintf('.\\MCU_Wrapper\\run_mex.bat "%s" "%s" "%s" %s %s', includesArg, codeArg, definesAllArg, modeArg, echoArg);
+
+
+
+if(strcmpi(isExtConsole, 'on'))
+    cmdout = runBatAndShowOutput(cmd);
+else
+    [status, cmdout]= system(cmd);
+end
+
+% Сохраним вывод в параметр маски с именем 'consoleOutput'
+set_param(gcb, 'consoleOutput', cmdout);
+
+% % Обновим Mask Display для показа
+% maskDisplayStr = sprintf('disp(''%s'')', cmdout);
+% set_param(gcb, 'MaskDisplay', maskDisplayStr);
+
+beep
+
+
+
+%%
+
+
+function [includesArg, codeArg] = make_mex_arguments(incTableName, srcTableame)
+%MAKE_MEX_ARGUMENTS Формирует строки аргументов для вызова mex-компиляции через батник
+%
+% [includesArg, codeArg] = make_mex_arguments(includesCell, codeCell)
+%
+% Вход:
+%   includesCell — ячейковый массив путей к директориям include
+%   codeCell     — ячейковый массив исходных файлов
+%
+% Выход:
+%   includesArg  — строка для передачи в батник, например: "-I"inc1" -I"inc2""
+%   codeArg      — строка с исходниками, например: ""src1.c" "src2.cpp""
+
+
+    % Здесь пример получения из маски текущего блока (замени по своему)
+    blockHandle = gcbh;  % или замени на нужный блок
+
+    includesCell = parseCellString(get_param(blockHandle, incTableName));
+    codeCell = parseCellString(get_param(blockHandle, srcTableame));
+
+    % Оборачиваем пути в кавычки и добавляем -I
+    includesStr = strjoin(cellfun(@(f) ['-I"' f '"'], includesCell, 'UniformOutput', false), ' ');
+
+    % Оборачиваем имена файлов в кавычки
+    codeStr = strjoin(cellfun(@(f) ['"' f '"'], codeCell, 'UniformOutput', false), ' ');
+
+    % Удаляем символ переноса строки и пробел в конце, если вдруг попал
+    codeStr = strtrim(codeStr);
+    includesStr = strtrim(includesStr);
+
+    % Оборачиваем всю строку в кавычки, чтобы батник корректно понял
+    % includesArg = ['"' includesStr '"'];
+    % codeArg = ['"' codeStr '"'];
+    includesArg = includesStr;
+    codeArg = codeStr;
+
+end
+
+function cmdret = runBatAndShowOutput(cmd)
+    import java.io.*;
+    import java.lang.*;
+    cmdEnglish = ['chcp 437 > nul && ' cmd];
+    pb = java.lang.ProcessBuilder({'cmd.exe', '/c', cmdEnglish});
+    pb.redirectErrorStream(true);
+    process = pb.start();
+
+    reader = BufferedReader(InputStreamReader(process.getInputStream()));
+
+    cmdret = ""; % Здесь будем накапливать весь вывод
+
+    while true
+        if reader.ready()
+            line = char(reader.readLine());
+            if isempty(line)
+                break;
+            end
+            cmdret = cmdret + string(line) + newline; % сохраняем вывод
+            % Здесь выводим только новую строку
+            safeLine = strrep(line, '''', ''''''); % Экранируем апострофы
+            logWindow_append(safeLine);
+            drawnow; % обновляем GUI
+        else
+            if ~process.isAlive()
+                % дочитываем оставшиеся строки
+                while reader.ready()
+                    line = char(reader.readLine());
+                    if isempty(line)
+                        break;
+                    end
+                    cmdret = cmdret + string(line) + newline; % сохраняем вывод
+                    safeLine = strrep(line, '''', '''''');
+                    logWindow_append(safeLine);
+                    drawnow;
+                end
+                break;
+            end
+            pause(0.2);
+        end
+    end
+    process.waitFor();
+end
+
+
+function logWindow_append(line)
+    persistent fig hEdit jScrollPane jTextArea
+
+    if isempty(fig) || ~isvalid(fig)
+        fig = figure('Name', 'Log Window', 'Position', [100 100 600 400]);
+        hEdit = uicontrol('Style', 'edit', ...
+            'Max', 2, 'Min', 0, ...
+            'Enable', 'on', ...                   % Включаем взаимодействие
+            'FontName', 'Courier New', ...
+            'Position', [10 10 580 380], ...
+            'HorizontalAlignment', 'left', ...
+            'BackgroundColor', 'white', ...
+            'Tag', 'LogWindowFigure');
+
+        jScrollPane = findjobj(hEdit);                  % JScrollPane
+        jTextArea = jScrollPane.getViewport.getView;   % JTextArea внутри JScrollPane
+    end
+
+    oldText = get(hEdit, 'String');
+    if ischar(oldText)
+        oldText = {oldText};
+    end
+
+    set(hEdit, 'String', [oldText; {line}]);
+    drawnow;
+
+    % Автоскролл вниз:
+    jTextArea.setCaretPosition(jTextArea.getDocument.getLength);
+    drawnow;
+end
+
+
+function definesArg = buildDefinesString()
+    blockHandle = gcbh;
+
+    % Получаем MaskValues и MaskNames
+    maskValues = get_param(blockHandle, 'MaskValues');
+    paramNames = get_param(blockHandle, 'MaskNames');
+
+    % Индексы параметров
+    idxThreading = find(strcmp(paramNames, 'enableThreading'));
+    idxDeinit = find(strcmp(paramNames, 'enableDeinit'));
+    idxCycles = find(strcmp(paramNames, 'threadCycles'));
+    idxClk    = find(strcmp(paramNames, 'mcuClk'));
+
+    if any([isempty(idxThreading), isempty(idxDeinit),isempty(idxCycles), isempty(idxClk)])
+        error('Один или несколько параметров не найдены в маске');
+    end
+
+    % Значения
+    ThreadingVal = maskValues{idxThreading};
+    DeinitVal = maskValues{idxDeinit};
+    cyclesVal = maskValues{idxCycles};
+    clkMHz    = str2double(maskValues{idxClk});
+    clkHz     = round(clkMHz * 1e6);
+
+    % Формируем defines в формате: -D"NAME=VALUE"
+    if strcmpi(ThreadingVal, 'on')
+        def1 = ['-D"RUN_APP_MAIN_FUNC_THREAD"'];
+    else
+        def1 = [''];
+    end
+
+    if strcmpi(DeinitVal, 'on')
+        def2 = ['-D"DEINITIALIZE_AFTER_SIM"'];
+    else
+        def2 = [''];
+    end
+
+    def3 = ['-D"DEKSTOP_CYCLES_FOR_MCU_APP__EQ__' cyclesVal '"'];
+    def4 = ['-D"MCU_CORE_CLOCK__EQ__' num2str(clkHz) '"'];
+
+    definesArg = strjoin({def1, def2, def3, def4}, ' ');
+    % definesArg = ['"' definesStr ''];
+    % definesArg = definesStr;
+end
+
+
+function definesUserArg = parseDefinesMaskText()
+    blockHandle = gcbh;
+
+    % Получаем MaskValues и MaskNames
+    maskValues = get_param(blockHandle, 'MaskValues');
+    paramNames = get_param(blockHandle, 'MaskNames');
+
+    % Индекс параметра userDefs
+    idxUserDefs = find(strcmp(paramNames, 'userDefs'));
+    definesText = maskValues{idxUserDefs}; % Текст с пользовательскими определениями
+
+    % Убираем буквальные символы \n и \r
+    definesText = strrep(definesText, '\n', ' ');
+    definesText = strrep(definesText, '\r', ' ');
+
+    % Разбиваем по переносам строк
+    lines = split(definesText, {'\n', '\r\n', '\r'});
+
+    parts = strings(1,0); % пустой массив строк
+
+    for k = 1:numel(lines)
+        line = strtrim(lines{k});
+        if isempty(line)
+            continue;
+        end
+
+        % Разбиваем по пробелам, чтобы получить отдельные определения в строке
+        tokens = split(line);
+
+        for t = 1:numel(tokens)
+            token = strtrim(tokens{t});
+            if isempty(token)
+                continue;
+            end
+
+            eqIdx = strfind(token, '=');
+            if isempty(eqIdx)
+                % Просто ключ без значения
+                parts(end+1) = sprintf('-D"%s"', token);
+            else
+                key = strtrim(token(1:eqIdx(1)-1));
+                val = strtrim(token(eqIdx(1)+1:end));
+                parts(end+1) = sprintf('-D"%s__EQ__%s"', key, val);
+            end
+        end
+    end
+
+    definesUserArg = strjoin(parts, ' ');
+end
+
+
+
+
+function out = parseCellString(str)
+    str = strtrim(str);
+    if startsWith(str, '{') && endsWith(str, '}')
+        str = str(2:end-1);
+    end
+
+    parts = split(str, ';');
+    out = cell(numel(parts), 1);
+    for i = 1:numel(parts)
+        el = strtrim(parts{i});
+        if startsWith(el, '''') && endsWith(el, '''')
+            el = el(2:end-1);
+        end
+        out{i} = el;
+    end
+
+    if isempty(out) || (numel(out) == 1 && isempty(out{1}))
+        out = {};
+    end
+end
+
+function str = cellArrayToString(cellArray)
+    quoted = cellfun(@(s) ['''' s ''''], cellArray, 'UniformOutput', false);
+    str = ['{' strjoin(quoted, ';') '}'];
+end
+
+
+
+% % Компилирует 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
+% 
--- a/mycode.c
+++ b/mycode.c
@@ -0,0 +1,14 @@
+void app_init() {
+    // code of foo
+}
+
+void app_step() {
+    // code of foo
+}
+
+void app_readInputs() {
+    // code of foo
+}
+void app_writeOutputBuffer() {
+    // code of foo
+}
Author	SHA1	Message	Date
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
Razvalyaev	6392d35129	Добавлен ForceDisconnect	2025-05-16 13:46:26 +03:00
Razvalyaev	1c5ce14f0f	просто апдейт симулинк	2025-05-16 08:07:14 +03:00
Razvalyaev	c3d30fa6f1	добавлены параметры упп в модель симулинк	2025-05-10 22:08:06 +03:00
Razvalyaev	97368919cb	Структурирован схема симулинк - всякое вынесено в субфункции	2025-05-10 01:41:16 +03:00