Compare commits

...

2 Commits

Author SHA1 Message Date
47365da124 сделан редактор кода оболочки прямо в маске 2025-06-09 10:14:42 +03:00
25da0591b4 доделан выбор потока из маски
сделан вывод в внешнюю терминалку (по выбору)
2025-06-09 08:22:16 +03:00
10 changed files with 284 additions and 242 deletions

View File

@ -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 */

View File

@ -17,7 +17,5 @@
void Simulate_GPIO_BSRR(void);
void WriteFromSFunc(real_T* disc);
void ReadToSFunc(real_T* in);
#endif // _MATLAB_GPIO_H_

View File

@ -1,22 +1,71 @@
#include "stm32f1xx_matlab_gpio.h"
/**
**************************************************************************
* @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 */
}
#define detect_front(_in_numb_, _var_, _val_) { \
if ((in[_in_numb_] > 0.5) && (prev_in[_in_numb_] <= 0.5)) \
{ \
_var_ = _val_; \
} }
void app_step(void)
{
upp_main();
}
#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)
void app_writeOutputBuffer(real_T* disc)
{
for (int i = 0; i < PORT_WIDTH; i++)
@ -39,8 +88,21 @@ void WriteFromSFunc(real_T* disc)
void ReadToSFunc(real_T* in)
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);
@ -73,4 +135,4 @@ void ReadToSFunc(real_T* in)
{
prev_in[i] = in[i];
}
}
}

BIN
MCU_Wrapper/findjobj.mltbx Normal file

Binary file not shown.

View File

@ -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*/
@ -109,7 +109,7 @@ void MCU_writeOutputs(SimStruct* S)
real_T* Out_Buff = ssGetDiscStates(S);
Simulate_GPIO_BSRR();
WriteFromSFunc(Out_Buff);
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
}

View File

@ -152,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);

View File

@ -20,9 +20,7 @@ set compil_mode=%~4
set defines_USER=%defines_USER:__EQ__==%
set defines_WRAPPER=-D"STM32F103xB" -D"USE_HAL_DRIVER"^
-D"MATLAB"^
-D"__sizeof_ptr=8"
set defines_WRAPPER=-D"MATLAB"^ -D"__sizeof_ptr=8"
:: -------------------------USERS PATHS AND CODE---------------------------
::-------------------------------------------------------------------------
@ -69,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
::-------------------------------------------------------------------------
@ -135,7 +134,5 @@ echo ===========================
echo MODE: %compil_mode%
echo ===========================
echo mex %output% %defines% %includes% %codes% %debug%
mex %output% %defines% %includes% %codes% %debug%
echo %DATE% %TIME%

Binary file not shown.

197
mexing.m
View File

@ -1,32 +1,53 @@
% Компилирует S-function
clear, clc
close;
Ts = 0.00001;
% Флаг режима отладки
definesArg = buildDefinesString();
definesUserArg = parseDefinesMaskText();
definesAllArg = [definesArg + " " + definesUserArg];
maskValues = get_param(gcbh, 'MaskValues');
paramNames = get_param(gcbh, 'MaskNames');
inxDebug = find(strcmp(paramNames, 'enableDebug'));
idxExtConsole = find(strcmp(paramNames, 'extConsol'));
isDebug = maskValues{inxDebug};
isExtConsole = maskValues{idxExtConsole};
maskNames = get_param(gcbh, 'MaskNames');
isDebug = find(strcmp(maskNames, 'enableDebug'));
if strcmpi(isDebug, 'on')
modeArg = "release";
else
modeArg = "debug";
else
modeArg = "release";
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', includesArg, codeArg, definesArg, modeArg);
cmd = sprintf('.\\MCU_Wrapper\\run_mex.bat "%s" "%s" "%s" %s', includesArg, codeArg, definesAllArg, modeArg);
status = system(cmd);
if status == 0
beep
if(strcmpi(isExtConsole, 'on'))
cmdout = runBatAndShowOutput(cmd);
else
error('Error during compilation');
[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)
@ -67,6 +88,83 @@ function [includesArg, codeArg] = make_mex_arguments(incTableName, srcTableame)
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;
@ -75,35 +173,96 @@ function definesArg = buildDefinesString()
paramNames = get_param(blockHandle, 'MaskNames');
% Индексы параметров
idxEnable = find(strcmp(paramNames, 'enableThreading'));
idxThreading = find(strcmp(paramNames, 'enableThreading'));
idxDeinit = find(strcmp(paramNames, 'enableDeinit'));
idxCycles = find(strcmp(paramNames, 'threadCycles'));
idxClk = find(strcmp(paramNames, 'mcuClk'));
if any([isempty(idxEnable), isempty(idxCycles), isempty(idxClk)])
if any([isempty(idxThreading), isempty(idxDeinit),isempty(idxCycles), isempty(idxClk)])
error('Один или несколько параметров не найдены в маске');
end
% Значения
enableVal = maskValues{idxEnable};
ThreadingVal = maskValues{idxThreading};
DeinitVal = maskValues{idxDeinit};
cyclesVal = maskValues{idxCycles};
clkMHz = str2double(maskValues{idxClk});
clkHz = round(clkMHz * 1e6);
% Формируем defines в формате: -D"NAME=VALUE"
if strcmpi(enableVal, 'on')
if strcmpi(ThreadingVal, 'on')
def1 = ['-D"RUN_APP_MAIN_FUNC_THREAD"'];
else
def1 = [''];
end
def2 = ['-D"DEKSTOP_CYCLES_FOR_MCU_APP__EQ__' cyclesVal '"'];
def3 = ['-D"MCU_CORE_CLOCK__EQ__' num2str(clkHz) '"'];
definesArg = strjoin({def1, def2, def3}, ' ');
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);
@ -131,6 +290,8 @@ function str = cellArrayToString(cellArray)
str = ['{' strjoin(quoted, ';') '}'];
end
% % Компилирует S-function
% clear, clc,
%

14
mycode.c Normal file
View File

@ -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
}