сделано расширенное эхо в консоли по кнопку
This commit is contained in:
parent
63ce872689
commit
59b4f9cffc
@ -86,49 +86,50 @@ IF %compil_mode%==[debug] (set debug= -g)
|
|||||||
|
|
||||||
|
|
||||||
::------START COMPILING-------
|
::------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 ===========================
|
||||||
echo INCLUDES:
|
echo SOURCES:
|
||||||
echo USER:
|
echo USER:
|
||||||
for %%f in (%includes_USER%) do (
|
for %%f in (%code_USER%) do (
|
||||||
echo %%f
|
echo %%f
|
||||||
)
|
)
|
||||||
echo INTERNAL:
|
echo INTERNAL:
|
||||||
for %%f in (%includes_MCU%) do (
|
for %%f in (%code_WRAPPER%) do (
|
||||||
echo %%f
|
echo %%f
|
||||||
)
|
)
|
||||||
for %%f in (%includes_WRAPPER%) do (
|
for %%f in (%code_MCU_Sim%) do (
|
||||||
echo %%f
|
echo %%f
|
||||||
)
|
)
|
||||||
|
for %%f in (%code_MCU%) do (
|
||||||
|
echo %%f
|
||||||
|
)
|
||||||
|
|
||||||
echo ===========================
|
echo ===========================
|
||||||
echo SOURCES:
|
echo DEFINES:
|
||||||
echo USER:
|
echo USER:
|
||||||
for %%f in (%code_USER%) do (
|
for %%d in (%defines_USER%) do (
|
||||||
echo %%f
|
echo %%d
|
||||||
)
|
)
|
||||||
echo INTERNAL:
|
echo INTERNAL:
|
||||||
for %%f in (%code_WRAPPER%) do (
|
for %%f in (%defines_WRAPPER%) do (
|
||||||
echo %%f
|
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 ===========================
|
||||||
echo MODE: %compil_mode%
|
echo MODE: %compil_mode%
|
||||||
|
|||||||
Binary file not shown.
18
mexing.m
18
mexing.m
@ -5,6 +5,10 @@ close;
|
|||||||
|
|
||||||
Ts = 0.00001;
|
Ts = 0.00001;
|
||||||
|
|
||||||
|
delete("*.mexw64")
|
||||||
|
delete("*.mexw64.pdb")
|
||||||
|
delete(".\MCU_Wrapper\Outputs\*.*");
|
||||||
|
|
||||||
% Флаг режима отладки
|
% Флаг режима отладки
|
||||||
definesArg = buildDefinesString();
|
definesArg = buildDefinesString();
|
||||||
definesUserArg = parseDefinesMaskText();
|
definesUserArg = parseDefinesMaskText();
|
||||||
@ -15,9 +19,11 @@ paramNames = get_param(gcbh, 'MaskNames');
|
|||||||
|
|
||||||
inxDebug = find(strcmp(paramNames, 'enableDebug'));
|
inxDebug = find(strcmp(paramNames, 'enableDebug'));
|
||||||
idxExtConsole = find(strcmp(paramNames, 'extConsol'));
|
idxExtConsole = find(strcmp(paramNames, 'extConsol'));
|
||||||
|
idxFullOutput = find(strcmp(paramNames, 'fullOutput'));
|
||||||
|
|
||||||
isDebug = maskValues{inxDebug};
|
isDebug = maskValues{inxDebug};
|
||||||
isExtConsole = maskValues{idxExtConsole};
|
isExtConsole = maskValues{idxExtConsole};
|
||||||
|
isFullOutput = maskValues{idxFullOutput};
|
||||||
|
|
||||||
if strcmpi(isDebug, 'on')
|
if strcmpi(isDebug, 'on')
|
||||||
modeArg = "debug";
|
modeArg = "debug";
|
||||||
@ -25,17 +31,27 @@ else
|
|||||||
modeArg = "release";
|
modeArg = "release";
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if strcmpi(isFullOutput, 'on')
|
||||||
|
echoArg = 'echo_enable';
|
||||||
|
else
|
||||||
|
echoArg = 'echo_disable';
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
[includesArg, codeArg] = make_mex_arguments('incTable', 'srcTable');
|
[includesArg, codeArg] = make_mex_arguments('incTable', 'srcTable');
|
||||||
|
|
||||||
set_param(gcb, 'consoleOutput', '');
|
set_param(gcb, 'consoleOutput', '');
|
||||||
% Вызов батника с двумя параметрами: includes и code
|
% Вызов батника с двумя параметрами: includes и code
|
||||||
cmd = sprintf('.\\MCU_Wrapper\\run_mex.bat "%s" "%s" "%s" %s', includesArg, codeArg, definesAllArg, modeArg);
|
cmd = sprintf('.\\MCU_Wrapper\\run_mex.bat "%s" "%s" "%s" %s %s', includesArg, codeArg, definesAllArg, modeArg, echoArg);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(strcmpi(isExtConsole, 'on'))
|
if(strcmpi(isExtConsole, 'on'))
|
||||||
cmdout = runBatAndShowOutput(cmd);
|
cmdout = runBatAndShowOutput(cmd);
|
||||||
else
|
else
|
||||||
[status, cmdout]= system(cmd);
|
[status, cmdout]= system(cmd);
|
||||||
end
|
end
|
||||||
|
|
||||||
% Сохраним вывод в параметр маски с именем 'consoleOutput'
|
% Сохраним вывод в параметр маски с именем 'consoleOutput'
|
||||||
set_param(gcb, 'consoleOutput', cmdout);
|
set_param(gcb, 'consoleOutput', cmdout);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user