powertrain-build 1.13.1__py3-none-any.whl → 1.13.3.dev3__py3-none-any.whl

powertrain_build/matlab_scripts/helperFunctions/getDefOutport.m

@@ -1,58 +1,58 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function outport = getDefOutport(startBlock)
-%% Find the blocks where the lowest level outport for the defining block
-    tmpSrcBlock=getSrcBlocks(startBlock);
-    tmpPort=get_param(getSrcLines(startBlock), 'srcporthandle');
-    outport = -1;
-    while 1
-        %% If multiple links were found
-        tmpH=getDstBlockHandles(tmpSrcBlock, tmpPort);
-        if length(tmpH) > 1
-            break
-
-        %% If the block is a inport, but not a TL-port
-        elseif strcmp(get_param(tmpSrcBlock, 'blocktype'), 'Inport') && ...
-            isempty(get_param(tmpSrcBlock,'MaskType'))
-            tmp=get_param(get_param(tmpSrcBlock, 'parent'), 'linehandles');
-            tmpPort=get_param(tmp.Inport(str2num(get_param(tmpSrcBlock, 'port'))), 'srcporthandle');
-            tmpSrcBlock=get_param(tmp.Inport(str2num(get_param(tmpSrcBlock, 'port'))), 'srcblockhandle');
-
-        %% If the block is a From-block
-        elseif strcmp(get_param(tmpSrcBlock, 'blocktype'), 'From')
-            goto=find_system(get_param(tmpSrcBlock,'parent'), 'lookundermasks', ...
-                            'on','searchdepth',1,'blocktype','Goto','GotoTag', ...
-                            get_param(tmpSrcBlock,'GotoTag'));
-            tmp=get_param(goto{1},'linehandles');
-            tmpPort=get_param(tmp.Inport,'srcporthandle');
-            tmpSrcBlock=get_param(tmp.Inport,'srcblockhandle');
-
-        %% If subsystem
-        elseif strcmp(get_param(tmpSrcBlock,'blocktype'),'SubSystem')
-            % Don't move outports inside library blocks
-            if ~isempty(get_param(tmpSrcBlock, 'MaskType')) &&...
-                    (strncmp(get_param(tmpSrcBlock, 'MaskType'), 'VCC_', 4) ||...
-                    strncmp(get_param(tmpSrcBlock, 'MaskType'), 'TL_', 3))
-                break
-            end
-
-            outport=find_system(tmpSrcBlock,'lookundermasks','on','searchdepth',1, ...
-                                'blocktype','Outport','port', ...
-                                num2str(get(tmpPort,'PortNumber')));
-            tmpPort=get_param(getSrcLines(outport),'srcporthandle');
-            tmpSrcBlock=getSrcBlocks(outport);
-        else
-            break
-        end
-    end
-end
-
-function dstBlocks = getDstBlockHandles(block, port)
-    dstBlocks=[];
-    tmp=get_param(block,'linehandles');
-    tmpNum=get_param(port,'PortNumber');
-    if isfield(tmp,'Outport')
-        dstBlocks = get_param(tmp.Outport(tmpNum),'dstblockhandle');
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function outport = getDefOutport(startBlock)
+%% Find the blocks where the lowest level outport for the defining block
+    tmpSrcBlock=getSrcBlocks(startBlock);
+    tmpPort=get_param(getSrcLines(startBlock), 'srcporthandle');
+    outport = -1;
+    while 1
+        %% If multiple links were found
+        tmpH=getDstBlockHandles(tmpSrcBlock, tmpPort);
+        if length(tmpH) > 1
+            break
+
+        %% If the block is a inport, but not a TL-port
+        elseif strcmp(get_param(tmpSrcBlock, 'blocktype'), 'Inport') && ...
+            isempty(get_param(tmpSrcBlock,'MaskType'))
+            tmp=get_param(get_param(tmpSrcBlock, 'parent'), 'linehandles');
+            tmpPort=get_param(tmp.Inport(str2num(get_param(tmpSrcBlock, 'port'))), 'srcporthandle');
+            tmpSrcBlock=get_param(tmp.Inport(str2num(get_param(tmpSrcBlock, 'port'))), 'srcblockhandle');
+
+        %% If the block is a From-block
+        elseif strcmp(get_param(tmpSrcBlock, 'blocktype'), 'From')
+            goto=find_system(get_param(tmpSrcBlock,'parent'), 'lookundermasks', ...
+                            'on','searchdepth',1,'blocktype','Goto','GotoTag', ...
+                            get_param(tmpSrcBlock,'GotoTag'));
+            tmp=get_param(goto{1},'linehandles');
+            tmpPort=get_param(tmp.Inport,'srcporthandle');
+            tmpSrcBlock=get_param(tmp.Inport,'srcblockhandle');
+
+        %% If subsystem
+        elseif strcmp(get_param(tmpSrcBlock,'blocktype'),'SubSystem')
+            % Don't move outports inside library blocks
+            if ~isempty(get_param(tmpSrcBlock, 'MaskType')) &&...
+                    (strncmp(get_param(tmpSrcBlock, 'MaskType'), 'VCC_', 4) ||...
+                    strncmp(get_param(tmpSrcBlock, 'MaskType'), 'TL_', 3))
+                break
+            end
+
+            outport=find_system(tmpSrcBlock,'lookundermasks','on','searchdepth',1, ...
+                                'blocktype','Outport','port', ...
+                                num2str(get(tmpPort,'PortNumber')));
+            tmpPort=get_param(getSrcLines(outport),'srcporthandle');
+            tmpSrcBlock=getSrcBlocks(outport);
+        else
+            break
+        end
+    end
+end
+
+function dstBlocks = getDstBlockHandles(block, port)
+    dstBlocks=[];
+    tmp=get_param(block,'linehandles');
+    tmpNum=get_param(port,'PortNumber');
+    if isfield(tmp,'Outport')
+        dstBlocks = get_param(tmp.Outport(tmpNum),'dstblockhandle');
+    end
+end

powertrain_build/matlab_scripts/helperFunctions/getDstBlocks.m

@@ -1,19 +1,19 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function dstBlocks = getDstBlocks(block)
-%% Find the blocks where the input variables are defined
-
-    dstBlocks=[];
-    tmp=get_param(block,'linehandles');
-
-    if isfield(tmp,'Outport')
-        for i=1:length(tmp.Outport)
-            if tmp.Outport(i)<0
-                dstBlocks(i)=-1;
-            else
-                dstBlocks = [dstBlocks; get_param(tmp.Outport(i),'dstblockhandle')];
-            end
-        end
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function dstBlocks = getDstBlocks(block)
+%% Find the blocks where the input variables are defined
+
+    dstBlocks=[];
+    tmp=get_param(block,'linehandles');
+
+    if isfield(tmp,'Outport')
+        for i=1:length(tmp.Outport)
+            if tmp.Outport(i)<0
+                dstBlocks(i)=-1;
+            else
+                dstBlocks = [dstBlocks; get_param(tmp.Outport(i),'dstblockhandle')];
+            end
+        end
+    end
+end

powertrain_build/matlab_scripts/helperFunctions/getDstLines.m

@@ -1,13 +1,13 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function dstLines = getDstLines(Block)
-
-    tmp=get_param(Block,'linehandles');
-
-    if isfield(tmp,'Outport')
-        dstLines=tmp.Outport;
-    else
-        dstLines=[];
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function dstLines = getDstLines(Block)
+
+    tmp=get_param(Block,'linehandles');
+
+    if isfield(tmp,'Outport')
+        dstLines=tmp.Outport;
+    else
+        dstLines=[];
+    end
+end

powertrain_build/matlab_scripts/helperFunctions/getInterfaceSignals.m

@@ -1,37 +1,37 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function interfaceSignals = getInterfaceSignals(rootFolder)
-    activeInterfaceFiles = dir([rootFolder '/Projects/*/Config/ActiveInterfaces/*Output.csv']);
-    disp('Reading active interface files');
-    signalNameColumn = 2;
-    signalMinColumn = 5;
-    signalMaxColumn = 6;
-    signalInitValueColumn = 9;
-    signals = [];
-    minimums = [];
-    maximums = [];
-    values = [];
-
-    for fileIndex = 1:length(activeInterfaceFiles)
-        interfaceFile = activeInterfaceFiles(fileIndex, :);
-        filePath = fullfile(interfaceFile.folder, interfaceFile.name);
-        disp(['Reading:' filePath])
-        options = detectImportOptions(filePath);
-        options.LineEnding = {'\r\n'};
-        csvContent = readtable(filePath, options);
-        signals = [signals; csvContent{:, signalNameColumn}];
-        minimums = [minimums; csvContent{:, signalMinColumn}];
-        maximums = [maximums; csvContent{:, signalMaxColumn}];
-        values = [values; csvContent{:, signalInitValueColumn}];
-        % Remove duplicate signals, hopefully, the initial values were the same...
-        [signals, indices] = unique(signals, 'stable');
-        minimums = minimums(indices);
-        maximums = maximums(indices);
-        values = values(indices);
-    end
-
-    replaceNaNs = isnan(values);
-    values(replaceNaNs) = 0;
-    interfaceSignals = horzcat(signals, num2cell(minimums), num2cell(maximums), num2cell(values));
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function interfaceSignals = getInterfaceSignals(rootFolder)
+    activeInterfaceFiles = dir([rootFolder '/Projects/*/Config/ActiveInterfaces/*Output.csv']);
+    disp('Reading active interface files');
+    signalNameColumn = 2;
+    signalMinColumn = 5;
+    signalMaxColumn = 6;
+    signalInitValueColumn = 9;
+    signals = [];
+    minimums = [];
+    maximums = [];
+    values = [];
+
+    for fileIndex = 1:length(activeInterfaceFiles)
+        interfaceFile = activeInterfaceFiles(fileIndex, :);
+        filePath = fullfile(interfaceFile.folder, interfaceFile.name);
+        disp(['Reading:' filePath])
+        options = detectImportOptions(filePath);
+        options.LineEnding = {'\r\n'};
+        csvContent = readtable(filePath, options);
+        signals = [signals; csvContent{:, signalNameColumn}];
+        minimums = [minimums; csvContent{:, signalMinColumn}];
+        maximums = [maximums; csvContent{:, signalMaxColumn}];
+        values = [values; csvContent{:, signalInitValueColumn}];
+        % Remove duplicate signals, hopefully, the initial values were the same...
+        [signals, indices] = unique(signals, 'stable');
+        minimums = minimums(indices);
+        maximums = maximums(indices);
+        values = values(indices);
+    end
+
+    replaceNaNs = isnan(values);
+    values(replaceNaNs) = 0;
+    interfaceSignals = horzcat(signals, num2cell(minimums), num2cell(maximums), num2cell(values));
+end

powertrain_build/matlab_scripts/helperFunctions/getName.m

@@ -1,37 +1,37 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function macro = getName(handle, macro)
-
-    if nargin == 1
-        macro = tl_get(handle, 'output.name');
-    end
-    tmp_system = get_param(handle, 'Parent');
-    idx = strfind(tmp_system, '/');
-    TLSystem = tmp_system(1:idx(1)-1);
-    if ~isempty(strfind(macro,'$L'))
-        %get_param(Handle,'masktype')
-        if ismember(get_param(handle,'masktype'),{'TL_Outport', 'TL_BusOutport'})
-            line=getSrcLines(handle);
-            lineName=get(line,'name');
-            if isempty(lineName)
-                lineName=get(get(line,'SrcPortHandle'),'PropagatedSignals');
-            end
-            macro=strrep(macro,'$L',lineName);
-        else
-            macro=strrep(macro,'$L',get(getDstLines(handle),'name'));
-        end
-    end
-
-    if ~isempty(strfind(macro,'$N'))
-        macro=strrep(macro,'$N',TLSystem);
-    end
-    if ~isempty(strfind(macro,'$B'))
-        macro=strrep(macro,'$B',get_param(handle,'name'));
-    end
-    if ~isempty(strfind(macro,'$S'))
-        parent=get_param(handle,'Parent');
-        backslash=strfind(parent,'/');
-        macro=strrep(macro,'$S',parent(backslash(end)+1:end));
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function macro = getName(handle, macro)
+
+    if nargin == 1
+        macro = tl_get(handle, 'output.name');
+    end
+    tmp_system = get_param(handle, 'Parent');
+    idx = strfind(tmp_system, '/');
+    TLSystem = tmp_system(1:idx(1)-1);
+    if ~isempty(strfind(macro,'$L'))
+        %get_param(Handle,'masktype')
+        if ismember(get_param(handle,'masktype'),{'TL_Outport', 'TL_BusOutport'})
+            line=getSrcLines(handle);
+            lineName=get(line,'name');
+            if isempty(lineName)
+                lineName=get(get(line,'SrcPortHandle'),'PropagatedSignals');
+            end
+            macro=strrep(macro,'$L',lineName);
+        else
+            macro=strrep(macro,'$L',get(getDstLines(handle),'name'));
+        end
+    end
+
+    if ~isempty(strfind(macro,'$N'))
+        macro=strrep(macro,'$N',TLSystem);
+    end
+    if ~isempty(strfind(macro,'$B'))
+        macro=strrep(macro,'$B',get_param(handle,'name'));
+    end
+    if ~isempty(strfind(macro,'$S'))
+        parent=get_param(handle,'Parent');
+        backslash=strfind(parent,'/');
+        macro=strrep(macro,'$S',parent(backslash(end)+1:end));
+    end
+end

powertrain_build/matlab_scripts/helperFunctions/getPath.m

@@ -1,6 +1,6 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function path = getPath(handle)
-    path=[get_param(handle,'parent') '/' get_param(handle,'name')];
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function path = getPath(handle)
+    path=[get_param(handle,'parent') '/' get_param(handle,'name')];
+end

powertrain_build/matlab_scripts/helperFunctions/getProperValue.m

@@ -1,21 +1,21 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function jsonValue = getProperValue(tlPort, tlValue)
-%GETPROPERVALUE Get a value fitting for a json file, given a TL property
-%value.
-    if strcmp(tlValue, 'IMPLICIT_ENUM')
-        tlValue = getEnumName(tlPort);
-    end
-
-    if ischar(tlValue)
-        jsonValue = tlValue;
-    elseif isempty(tlValue)
-        jsonValue = '-';
-    else
-        jsonValue = tlValue(1);
-        if isnan(jsonValue)
-            jsonValue = '-';
-        end
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function jsonValue = getProperValue(tlPort, tlValue)
+%GETPROPERVALUE Get a value fitting for a json file, given a TL property
+%value.
+    if strcmp(tlValue, 'IMPLICIT_ENUM')
+        tlValue = getEnumName(tlPort);
+    end
+
+    if ischar(tlValue)
+        jsonValue = tlValue;
+    elseif isempty(tlValue)
+        jsonValue = '-';
+    else
+        jsonValue = tlValue(1);
+        if isnan(jsonValue)
+            jsonValue = '-';
+        end
+    end
+end

powertrain_build/matlab_scripts/helperFunctions/getSrcBlocks.m

@@ -1,19 +1,19 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function srcBlocks = getSrcBlocks(block)
-
-    srcBlocks=[];
-    tmp=get_param(block,'linehandles');
-
-    if isfield(tmp,'Inport')
-        srcBlocks=zeros(size(tmp.Inport));
-        for i=1:length(tmp.Inport)
-            if tmp.Inport(i)<0
-                srcBlocks(i)=-1;
-            else
-                srcBlocks(i)=get_param(tmp.Inport(i),'srcblockhandle');
-            end
-        end
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function srcBlocks = getSrcBlocks(block)
+
+    srcBlocks=[];
+    tmp=get_param(block,'linehandles');
+
+    if isfield(tmp,'Inport')
+        srcBlocks=zeros(size(tmp.Inport));
+        for i=1:length(tmp.Inport)
+            if tmp.Inport(i)<0
+                srcBlocks(i)=-1;
+            else
+                srcBlocks(i)=get_param(tmp.Inport(i),'srcblockhandle');
+            end
+        end
+    end
+end

powertrain_build/matlab_scripts/helperFunctions/getSrcLines.m

@@ -1,13 +1,13 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function srcLines = getSrcLines(block)
-
-    tmp=get_param(block,'linehandles');
-
-    if isfield(tmp,'Inport')
-        srcLines=tmp.Inport;
-    else
-        srcLines=[];
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function srcLines = getSrcLines(block)
+
+    tmp=get_param(block,'linehandles');
+
+    if isfield(tmp,'Inport')
+        srcLines=tmp.Inport;
+    else
+        srcLines=[];
+    end
+end

powertrain_build/matlab_scripts/helperFunctions/loadLibraries.m

@@ -1,10 +1,10 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function loadLibraries(root_folder)
-    block_libraries = dir(fullfile(root_folder, '**/*.slx'));
-    for i=1:length(block_libraries)
-        block_library = block_libraries(i);
-        load_system(block_library.name);
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function loadLibraries(root_folder)
+    block_libraries = dir(fullfile(root_folder, '**/*.slx'));
+    for i=1:length(block_libraries)
+        block_library = block_libraries(i);
+        load_system(block_library.name);
+    end
+end

powertrain_build/matlab_scripts/helperFunctions/loadjson.m

@@ -1,6 +1,6 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function A = loadjson(filename)
-    A = jsondecode(fileread(filename));
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function A = loadjson(filename)
+    A = jsondecode(fileread(filename));
+end

powertrain_build/matlab_scripts/helperFunctions/modifyEnumStructField.m

@@ -1,21 +1,21 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function outStruct = modifyEnumStructField(inStruct)
-    % MODIFYENUMSTRUCTFIELD Update a given struct with data based on type.
-    %    If the given struct contains enumeration data, insert default value.
-    %    If not, remove the default field if present.
-    %
-    %    NOTE: Used in parse*Ports/parseCalMeasData where "instruct" is
-    %    created outside and then rewritten inside a for-loop.
-    %    Only enum variables should have the default field.
-    %
-    %    See also parseInPorts, parseOutPorts, parseCalMeasData.
-    tmpEnum = enumeration(inStruct.type);
-    if ~isempty(tmpEnum)
-        inStruct.default = char(tmpEnum.getDefaultValue());
-    elseif isfield(inStruct, 'default')
-        inStruct = rmfield(inStruct, 'default');
-    end
-    outStruct = inStruct;
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function outStruct = modifyEnumStructField(inStruct)
+    % MODIFYENUMSTRUCTFIELD Update a given struct with data based on type.
+    %    If the given struct contains enumeration data, insert default value.
+    %    If not, remove the default field if present.
+    %
+    %    NOTE: Used in parse*Ports/parseCalMeasData where "instruct" is
+    %    created outside and then rewritten inside a for-loop.
+    %    Only enum variables should have the default field.
+    %
+    %    See also parseInPorts, parseOutPorts, parseCalMeasData.
+    tmpEnum = enumeration(inStruct.type);
+    if ~isempty(tmpEnum)
+        inStruct.default = char(tmpEnum.getDefaultValue());
+    elseif isfield(inStruct, 'default')
+        inStruct = rmfield(inStruct, 'default');
+    end
+    outStruct = inStruct;
+end

powertrain_build/matlab_scripts/helperFunctions/removeConfigDuplicates.m

@@ -1,32 +1,32 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function out = removeConfigDuplicates(config)
-    %Take a cell array with configs an return
-    %a config cell array without duplicates
-
-    confs = {};    
-    lenConfig = length(config);
-    j=1;
-    for i=1:lenConfig
-        if ~checkIfDefined(config{i},confs)
-            confs{j} = config{i};
-            j=j+1;
-        end
-    end
-    out = confs;
-end
-
-function def = checkIfDefined(cellArr, inCellArrArr)
-% Check if cell array is defined within an array of cell arrays
-    def = 0;
-    for i=1:length(inCellArrArr)
-        lenCellArr = length(cellArr);
-        if lenCellArr == length(inCellArrArr{i})
-            if sum(strcmp(sort(cellArr),sort(inCellArrArr{i}))) == lenCellArr
-                def = 1;
-                return
-            end
-        end
-    end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function out = removeConfigDuplicates(config)
+    %Take a cell array with configs an return
+    %a config cell array without duplicates
+
+    confs = {};    
+    lenConfig = length(config);
+    j=1;
+    for i=1:lenConfig
+        if ~checkIfDefined(config{i},confs)
+            confs{j} = config{i};
+            j=j+1;
+        end
+    end
+    out = confs;
+end
+
+function def = checkIfDefined(cellArr, inCellArrArr)
+% Check if cell array is defined within an array of cell arrays
+    def = 0;
+    for i=1:length(inCellArrArr)
+        lenCellArr = length(cellArr);
+        if lenCellArr == length(inCellArrArr{i})
+            if sum(strcmp(sort(cellArr),sort(inCellArrArr{i}))) == lenCellArr
+                def = 1;
+                return
+            end
+        end
+    end
 end

powertrain_build/matlab_scripts/helperFunctions/sortSystemByClass.m

@@ -1,26 +1,26 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function classSortedBlocks = sortSystemByClass(system)    
-    classes={'CVC_DISP'; 'CVC_CAL'};
-    classSortedBlocks=struct;
-    for i=1:length(classes)
-        classSortedBlocks.(classes{i}) = [];
-    end
-
-    %TODO: this parsing is not that nice, as it will find combinations of class
-    %suffixes, which does not exist.
-    blksWithType = find_system(system, 'FindAll', 'on', 'lookundermasks', 'on', 'regexp', 'on', ...
-        'masktype', 'TL(?!_PreProcessorIf|_MilHandler|_Enable|_SimFrame|_MainDialog|_Function|_StateflowLogger|_StateflowLoggingMain|_ToolSelector|_AddFile|_DummyTrigger|_DataStoreRead|_DataStoreWrite|_CustomCode|SAMPLES_BW_LOGICAL_OPERATOR|SAMPLES_ROUNDING_FUNCTION|SAMPLES_16BIT_DECODER|SAMPLES_16BIT_ENCODER).*', 'data', '.*?''output''\,.*?');
-    classWithType= tl_get(blksWithType, 'output.class');
-    if ~isempty(classWithType)
-        for i=1:length(classes)
-            class = classes{i};
-            filter_tmp = regexp(classWithType,['(?:ASIL_[ABCD]/){0,1}' class '(?:_MERGEABLE|_BURAM)?' '(?:_ASIL_[ABCD]){0,1}' '$']);
-            if ~isempty(filter_tmp)
-                filter = cellfun(@(c)~isempty(c), filter_tmp);
-                classSortedBlocks.(classes{i}) = blksWithType(filter);
-            end
-        end
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function classSortedBlocks = sortSystemByClass(system)    
+    classes={'CVC_DISP'; 'CVC_CAL'};
+    classSortedBlocks=struct;
+    for i=1:length(classes)
+        classSortedBlocks.(classes{i}) = [];
+    end
+
+    %TODO: this parsing is not that nice, as it will find combinations of class
+    %suffixes, which does not exist.
+    blksWithType = find_system(system, 'FindAll', 'on', 'lookundermasks', 'on', 'regexp', 'on', ...
+        'masktype', 'TL(?!_PreProcessorIf|_MilHandler|_Enable|_SimFrame|_MainDialog|_Function|_StateflowLogger|_StateflowLoggingMain|_ToolSelector|_AddFile|_DummyTrigger|_DataStoreRead|_DataStoreWrite|_CustomCode|SAMPLES_BW_LOGICAL_OPERATOR|SAMPLES_ROUNDING_FUNCTION|SAMPLES_16BIT_DECODER|SAMPLES_16BIT_ENCODER).*', 'data', '.*?''output''\,.*?');
+    classWithType= tl_get(blksWithType, 'output.class');
+    if ~isempty(classWithType)
+        for i=1:length(classes)
+            class = classes{i};
+            filter_tmp = regexp(classWithType,['(?:ASIL_[ABCD]/){0,1}' class '(?:_MERGEABLE|_BURAM)?' '(?:_ASIL_[ABCD]){0,1}' '$']);
+            if ~isempty(filter_tmp)
+                filter = cellfun(@(c)~isempty(c), filter_tmp);
+                classSortedBlocks.(classes{i}) = blksWithType(filter);
+            end
+        end
+    end
+end