Skip to content

Commit

Permalink
fixed incorrect PU value in 10 channel input, fixed version block for…
Browse files Browse the repository at this point in the history
… 2024+, fixed pulse counter reset

added some comments to the start and stop functions of the project
  • Loading branch information
SpieringsAE committed Nov 14, 2024
1 parent 1f5994b commit 1e94d53
Show file tree
Hide file tree
Showing 6 changed files with 441 additions and 257 deletions.
Binary file modified GOcontrollSimulinkProject.sltx
Binary file not shown.
4 changes: 2 additions & 2 deletions ToolboxPackagingConfiguration.prj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<param.summary>A toolbox for working with the GOcontroll Moduline controllers</param.summary>
<param.description>This toolbox contains everything necessery to get started developping for the GOcontroll Moduline controllers, it will install the proper compiler and contains various blocks made to interact with the controllers hardware.</param.description>
<param.screenshot>${PROJECT_ROOT}/GOcontroll.png</param.screenshot>
<param.version>4.3.2.4</param.version>
<param.version>4.3.2.5</param.version>
<param.output>${PROJECT_ROOT}/GOcontroll-Simulink.mltbx</param.output>
<param.products.name>
<item>MATLAB</item>
Expand Down Expand Up @@ -188,7 +188,7 @@ updating_project_template.md</param.exclude.filters>
<vista>false</vista>
<linux>true</linux>
<solaris>false</solaris>
<osver>5.15.0-124-generic</osver>
<osver>5.15.0-125-generic</osver>
<os32>false</os32>
<os64>true</os64>
<arch>glnxa64</arch>
Expand Down
656 changes: 415 additions & 241 deletions blockset/blocks/GOcontroll_Moduline_Target.mdl

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions blockset/ert_linux_target_version.m
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,16 @@

function [version] = ert_linux_target_version()

version = 'GOcontroll V4.4.0-rc4';
version = 'GOcontroll V4.4.0-rc5';

%% V4.4.0 Update -:
% BREAKING Fixed mask errors in the 10 channel input, reset pulse counter and all the output blocks have been fixed this can reset certain parameters.
% In the case of the reset pulse counter block the library link has to be repaired, by changing 'Puls' to 'Pulse' in the link path
% BREAKING Fixed output module groundshift datatype, it is now an int16
% BREAKING Diagnostic blocks now follow the SAE J1939 DTC standard, this dramatically changes how they work
% Added standardised a version block to help with in model version management
% Added config parameter to Memory read, which reads a config parameter from /etc/go-simulink/
% User can now configure a simulink codegen/cache folder to prevent cluttering of the project folder
% Fixed output module groundshift datatype
% Diagnostic blocks now follow the SAE J1939 DTC standard
% Added read accelerometer block for reading out the accelerometer on the moduline mini

%% V4.3.2 Update 8-8-2024:
Expand Down
28 changes: 17 additions & 11 deletions blockset/utility_functions/GOcontrollSimulinkStart.m
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
%check if the toolbox is installed and enabled

try
%make sure the toolbox is enabled so the compiler paths can be taken from it
if ~matlab.addons.isAddonEnabled('GOcontroll-Simulink')
matlab.addons.enableAddon('GOcontroll-Simulink');
end
%make sure the toolbox is enabled so the compiler paths can be taken from it
if ~matlab.addons.isAddonEnabled('GOcontroll-Simulink')
matlab.addons.enableAddon('GOcontroll-Simulink');
end
catch
%The addon has to be installed to use its compiler(s)
error("The GOcontroll-Simulink toolbox must be installed to properly load this project, please install it first");
%The addon has to be installed to use its compiler(s)
error("The GOcontroll-Simulink toolbox must be installed to properly load this project, please install it first");
end

%correct the compiler paths in the getInstallationLocation.mlx file for the computer opening this project

%'Rename' the function so it no longer takes precedence over the one that is in the toolbox
movefile('+GOcontroll_Simulink_2023b_dev', 'temp');
%Convert the getInstallationLocation file to .m so we can read/edit it
matlab.internal.liveeditor.openAndConvert(fullfile(pwd, 'temp', 'getInstallationLocation.mlx'), fullfile(pwd, 'temp', 'temp.m'));
%Get the toolbox compiler paths
try
zig_x86 = GOcontroll_Simulink_2023b_dev.getInstallationLocation('Zig-x86');
zig_x86 = GOcontroll_Simulink_2023b_dev.getInstallationLocation('Zig-x86');
catch
zig_x86 = '';
zig_x86 = '';
end
try
zig_aarch64 = GOcontroll_Simulink_2023b_dev.getInstallationLocation('Zig-aarch64');
zig_aarch64 = GOcontroll_Simulink_2023b_dev.getInstallationLocation('Zig-aarch64');
catch
zig_aarch64 = '';
zig_aarch64 = '';
end
try
gnu = GOcontroll_Simulink_2023b_dev.getInstallationLocation('aarch64-none-linux-gnu-gcc');
Expand All @@ -44,7 +48,9 @@
matlab.internal.liveeditor.openAndSave(fullfile(pwd, '+GOcontroll_Simulink_2023b_dev', 'temp.m'), fullfile(pwd, '+GOcontroll_Simulink_2023b_dev', 'getInstallationLocation.mlx'));
%Delete the temporary .m file
delete(fullfile(pwd, '+GOcontroll_Simulink_2023b_dev', 'temp.m'));
%Disable the toolbox

%disable the toolbox so the project environment is used instead

matlab.addons.disableAddon("GOcontroll-Simulink");
%cleanup
clear file gnu new new_file zig_aarch64 zig_x86
2 changes: 2 additions & 0 deletions blockset/utility_functions/GOcontrollSimulinkStop.m
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
%re-enable the global add-on when closing the project

matlab.addons.enableAddon("GOcontroll-Simulink");

0 comments on commit 1e94d53

Please sign in to comment.