Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debugging of dll and simulink versions #6

Merged
merged 1 commit into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Src/UNICO_simulink.slx
Binary file not shown.
Binary file modified Src/dll_controller/DISCON.dll
Binary file not shown.
Binary file modified Src/dll_controller/DISCON.exp
Binary file not shown.
Binary file modified Src/dll_controller/UNICO.slx
Binary file not shown.
Binary file modified Src/dll_controller/UNICO.slxc
Binary file not shown.
54 changes: 27 additions & 27 deletions Src/dll_controller/UNICO_discon_rtw/UNICO.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down Expand Up @@ -1934,16 +1934,16 @@ static void UNICO_output(void)
} else if (fabs(UNICO_U.dRtGenSpd - rtb_Switch1_h) < fabs(UNICO_U.dMinOMSpd
- rtb_Switch1_h)) {
/* '<S26>:1:31' */
/* '<S26>:1:32' */
/* '<S26>:1:33' */
rtb_GenSpeedRef = UNICO_U.dRtGenSpd;
} else {
/* '<S26>:1:34' */
/* '<S26>:1:36' */
rtb_GenSpeedRef = UNICO_U.dMinOMSpd;
}
} else if (UNICO_U.dRgn3Mode == 0.0) {
/* '<S26>:1:44' */
/* '<S26>:1:46' */
/* '<S26>:1:45' */
/* '<S26>:1:47' */
/* '<S26>:1:48' */
count = UNICO_U.dRtPwr * UNICO_U.dGenEff / (0.5 * UNICO_U.dRhoAir *
3.1415926535897931 * (UNICO_U.dRotorRadius * UNICO_U.dRotorRadius) *
rt_powd_snf(rtb_Switch_p, 3.0));
Expand All @@ -1955,7 +1955,7 @@ static void UNICO_output(void)
count = UNICO_U.dCpMax;
}

/* '<S26>:1:48' */
/* '<S26>:1:49' */
mid_i = UNICO_DW.CpInvSgn_DIMS1[0];
loop_ub = UNICO_DW.CpInvSgn_DIMS1[0];
if (loop_ub - 1 >= 0) {
Expand Down Expand Up @@ -2041,15 +2041,15 @@ static void UNICO_output(void)
}
} while (exitg2 == 0);

/* '<S26>:1:49' */
/* '<S26>:1:50' */
rtb_GenSpeedRef = count_line * rtb_Switch_p / UNICO_U.dRotorRadius;
} else if (rtb_Switch_p < UNICO_U.dVLin) {
/* '<S26>:1:53' */
/* '<S26>:1:54' */
/* '<S26>:1:55' */
rtb_GenSpeedRef = UNICO_U.dRtGenSpd;
} else {
/* '<S26>:1:56' */
/* '<S26>:1:57' */
/* '<S26>:1:58' */
count = (rtb_Switch_p - UNICO_U.dVLin) * UNICO_U.dMRgn3Lin +
UNICO_U.dRtGenSpd;
if ((count >= UNICO_U.dMinOMSpd) || rtIsNaN(UNICO_U.dMinOMSpd)) {
Expand All @@ -2065,7 +2065,7 @@ static void UNICO_output(void)
* Gain: '<S12>/Gain1'
* Inport: '<Root>/dRefSpeedFLPF'
*/
/* '<S26>:1:63' */
/* '<S26>:1:64' */
rtb_tau = 6.2831853071795862 * UNICO_U.dRefSpeedFLPF * 0.001;

/* Product: '<S28>/Product2' incorporates:
Expand Down Expand Up @@ -2363,24 +2363,24 @@ static void UNICO_output(void)
UNICO_U.dMinOMSpdSwitch) * (rtb_Switch1_h - UNICO_U.dMinOMSpdSwitch)
+ xtmp;
} else if (rtb_y < Tgmin) {
/* '<S29>:1:48' */
/* '<S29>:1:52' */
/* '<S29>:1:47' */
/* '<S29>:1:51' */
rtb_GenTq = rtb_y;
}
}
} else if ((rtb_Switch1_h < UNICO_U.dRtGenSpd) && (rtb_Switch_p <=
UNICO_U.dRtWSpd)) {
/* '<S29>:1:71' */
/* '<S29>:1:73' */
/* '<S29>:1:56' */
/* '<S29>:1:58' */
rtb_GenTq = (rtb_y - count_line) / (UNICO_U.dRtGenSpd -
UNICO_U.dOMSpdSwitch) * (rtb_Switch1_h - UNICO_U.dOMSpdSwitch) +
count_line;
} else {
/* '<S29>:1:76' */
/* '<S29>:1:61' */
rtb_GenTq = rtb_y;
}
} else {
/* '<S29>:1:80' */
/* '<S29>:1:65' */
rtb_GenTq = rtb_y;
}

Expand Down Expand Up @@ -2628,8 +2628,8 @@ static void UNICO_output(void)
/* '<S5>:1:47' */
UNICO_fileManager_l(count, &filestar, &autoflush);
if (!(filestar == NULL)) {
fprintf(filestar, "Switch between Rgn1.5 and 2 [rad/s]: %f \n",
UNICO_U.dMinOMSpdSwitch);
fprintf(filestar, "Region 2 control [-]: %f \n",
UNICO_U.dRgn2Mode);
if (autoflush) {
fflush(filestar);
}
Expand All @@ -2638,8 +2638,8 @@ static void UNICO_output(void)
/* '<S5>:1:48' */
UNICO_fileManager_l(count, &filestar, &autoflush);
if (!(filestar == NULL)) {
fprintf(filestar, "Region 2 control [-]: %f \n",
UNICO_U.dRgn2Mode);
fprintf(filestar, "Switch for user defined K [-]: %f \n",
UNICO_U.dKSwitch);
if (autoflush) {
fflush(filestar);
}
Expand All @@ -2648,8 +2648,8 @@ static void UNICO_output(void)
/* '<S5>:1:49' */
UNICO_fileManager_l(count, &filestar, &autoflush);
if (!(filestar == NULL)) {
fprintf(filestar, "Switch for user defined K [-]: %f \n",
UNICO_U.dKSwitch);
fprintf(filestar, "User defined K value [Nms^2/rad^2]: %f \n",
UNICO_U.dRgn2K);
if (autoflush) {
fflush(filestar);
}
Expand All @@ -2658,8 +2658,8 @@ static void UNICO_output(void)
/* '<S5>:1:50' */
UNICO_fileManager_l(count, &filestar, &autoflush);
if (!(filestar == NULL)) {
fprintf(filestar, "User defined K value [Nms^2/rad^2]: %f \n",
UNICO_U.dRgn2K);
fprintf(filestar, "Switch between Rgn2 and 2.5 [rad/s]: %f \n",
UNICO_U.dOMSpdSwitch);
if (autoflush) {
fflush(filestar);
}
Expand All @@ -2668,8 +2668,8 @@ static void UNICO_output(void)
/* '<S5>:1:51' */
UNICO_fileManager_l(count, &filestar, &autoflush);
if (!(filestar == NULL)) {
fprintf(filestar, "Switch between Rgn2 and 2.5 [rad/s]: %f \n",
UNICO_U.dOMSpdSwitch);
fprintf(filestar, "Switch between Rgn1.5 and 2 [rad/s]: %f \n",
UNICO_U.dMinOMSpdSwitch);
if (autoflush) {
fflush(filestar);
}
Expand Down
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/UNICO.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
7 changes: 0 additions & 7 deletions Src/dll_controller/UNICO_discon_rtw/UNICO.lnk

This file was deleted.

2 changes: 1 addition & 1 deletion Src/dll_controller/UNICO_discon_rtw/UNICO.mk
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ALT_MATLAB_ROOT = C:\PROGRA~1\MATLAB\R2023a
MATLAB_BIN = C:\Program Files\MATLAB\R2023a\bin
ALT_MATLAB_BIN = C:\PROGRA~1\MATLAB\R2023a\bin
MASTER_ANCHOR_DIR =
START_DIR = C:\Users\utente\Desktop\dll_controller
START_DIR = C:\Users\utente\Desktop\UNICO\Src\dll_controller
S_FUNCTIONS =
S_FUNCTIONS_LIB =
NUMST = 1
Expand Down
Binary file modified Src/dll_controller/UNICO_discon_rtw/UNICO.obj
Binary file not shown.
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/UNICO_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/UNICO_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
Binary file modified Src/dll_controller/UNICO_discon_rtw/buildInfo.mat
Binary file not shown.
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/builtin_typeid_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
Binary file modified Src/dll_controller/UNICO_discon_rtw/codedescriptor.dmr
Binary file not shown.
Binary file modified Src/dll_controller/UNICO_discon_rtw/compileInfo.mat
Binary file not shown.
Binary file modified Src/dll_controller/UNICO_discon_rtw/discon_main.obj
Binary file not shown.
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/multiword_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rtGetInf.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rtGetInf.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
Binary file modified Src/dll_controller/UNICO_discon_rtw/rtGetInf.obj
Binary file not shown.
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rtGetNaN.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rtGetNaN.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
Binary file modified Src/dll_controller/UNICO_discon_rtw/rtGetNaN.obj
Binary file not shown.
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rt_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
Binary file modified Src/dll_controller/UNICO_discon_rtw/rt_logging.obj
Binary file not shown.
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rt_nonfinite.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rt_nonfinite.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
Binary file modified Src/dll_controller/UNICO_discon_rtw/rt_nonfinite.obj
Binary file not shown.
Binary file modified Src/dll_controller/UNICO_discon_rtw/rt_sim.obj
Binary file not shown.
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rtmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
2 changes: 1 addition & 1 deletion Src/dll_controller/UNICO_discon_rtw/rtw_proj.tmw
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Simulink Coder project for UNICO using C:\Users\utente\Desktop\dll_controller\discon_vc.tmf. MATLAB root = C:\Program Files\MATLAB\R2023a. SimStruct date: 19-nov-2022 22:41:38
Simulink Coder project for UNICO using C:\Users\utente\Desktop\UNICO\Src\dll_controller\discon_vc.tmf. MATLAB root = C:\Program Files\MATLAB\R2023a. SimStruct date: 19-nov-2022 22:41:38
This file is generated by Simulink Coder for use by the make utility
to determine when to rebuild objects when the name of the current Simulink Coder project changes.
The rtwinfomat located at: ..\slprj\discon\UNICO\tmwinternal\binfo.mat
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/rtwtypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
Binary file modified Src/dll_controller/UNICO_discon_rtw/rtwtypeschksum.mat
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<MF0 version="1.1" packageUris="http://schema.mathworks.com/mf0/SlCache/19700101">
<slcache.FileAttributes type="slcache.FileAttributes" uuid="ad15d1cd-55bf-4efa-b483-df73baaf1c43">
<checksum>tRsgVNoCw5cl12uj+90HJlBcDFevjrvl9/W6eetI9qBDKA/U1uUL8qqc5Np/BH+NyJ7qTtvV4o8c8Qu1ctNxng==</checksum>
<slcache.FileAttributes type="slcache.FileAttributes" uuid="ffadb80b-d924-44f8-934e-b71592d50cb7">
<checksum>s2goEi5GzZIMoAt0+EIAS2HtD4J69nNsMomEuu7ysBcScDa2wxiPHlNo5N8NyfjqVX4ZgaivvhmSvvHGZ6RmRw==</checksum>
</slcache.FileAttributes>
</MF0>
4 changes: 2 additions & 2 deletions Src/dll_controller/UNICO_discon_rtw/zero_crossing_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Code generation for model "UNICO".
*
* Model version : 10.58
* Model version : 10.57
* Simulink Coder version : 9.9 (R2023a) 19-Nov-2022
* C source code generated on : Tue Jan 9 12:19:13 2024
* C source code generated on : Tue Jan 23 14:51:54 2024
*
* Target selection: discon.tlc
* Note: GRT includes extra infrastructure and instrumentation for prototyping
Expand Down
Binary file modified Src/dll_controller/slprj/_jitprj/jitEngineAccessInfo.mat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Src/dll_controller/slprj/_sfprj/EMLReport/emlReportAccessInfo.mat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Src/dll_controller/slprj/_sfprj/UNICO/_self/sfun/info/binfo.mat
Binary file not shown.
Binary file modified Src/dll_controller/slprj/_sfprj/UNICO/amsi_serial.mat
Binary file not shown.
Binary file not shown.
Binary file modified Src/dll_controller/slprj/_sfprj/precompile/autoInferAccessInfo.mat
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading