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

powertrain_build/matlab_scripts/CodeGen/parseInPorts.m

@@ -1,106 +1,106 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function inPorts = parseInPorts(root_subsystem)
-    % parseInPorts Parse which block data shall be stored per block.
-    %
-    % See also parseModelInfo
-
-    % TODO: Some models have more tha one inport per variable. Should we
-    % check for this?
-    inPorts = struct();
-    info = {'description', 'type', 'unit', 'offset', 'lsb', 'min', 'max', 'class', 'width'};
-
-    normalInPorts = parseTLInPorts(root_subsystem, info);
-    normalFields = fieldnames(normalInPorts);
-    for idx = 1:length(normalFields)
-        inPorts.(normalFields{idx}) = normalInPorts.(normalFields{idx});
-    end
-
-    busInPorts = parseTLBusInPorts(root_subsystem, info);
-    busFields = fieldnames(busInPorts);
-    for idx = 1:length(busFields)
-        inPorts.(busFields{idx}) = busInPorts.(busFields{idx});
-    end
-end
-
-function inPorts = parseTLInPorts(root_subsystem, info)
-    in_ports = find_system(root_subsystem, 'FindAll', 'on',  'SearchDepth', 1, 'MaskType', 'TL_Inport');
-    inPorts = struct();
-    tmpInport = struct();
-    for i=1:length(in_ports)
-        inp = in_ports(i);
-        consumerBlks = getConsumerBlocks(inp);
-        codeSwTmp = {};
-        for j=1:length(consumerBlks)
-            consBlk = consumerBlks(j);
-            codeSwTmp{j} = getCodeSwitches(consBlk);
-        end
-        %TODO: Do a better reduction of code switch logics right now only duplicates are removed.
-        codeSw = removeConfigDuplicates(codeSwTmp);
-        tmpInport.handle = getPath(inp);
-        tmpInport.name = strtrim(getName(inp));
-        tmpInport.configs = codeSw;
-        for idx=1:length(info)
-            tmpValue = tl_get(inp, ['output.' info{idx}]);
-            tmpInport.(info{idx}) = getProperValue(inp, tmpValue);
-        end
-
-        tmpInport = modifyEnumStructField(tmpInport);
-
-        if strcmp(tmpInport.name, fields(inPorts))
-            printf('Warning: inport %s is already defined', tmpInport.name);
-            printf('         signal will not be added again to the input signal');
-        else
-            inPorts.(tmpInport.name) = tmpInport;
-        end
-    end
-end
-
-function busInPorts = parseTLBusInPorts(root_subsystem, info)
-    foundBusInPorts = find_system(root_subsystem, 'FindAll', 'on',  'SearchDepth', 1, 'MaskType', 'TL_BusInport');
-    busInPorts = struct();
-    tmpInport = struct();
-    for idx=1:length(foundBusInPorts)
-        inp = foundBusInPorts(idx);
-        for idy = 1:tl_get(inp, 'numoutputs')
-            tmpInport.handle = getPath(inp);
-            tmpInport.name = tl_get(inp, ['output(' num2str(idy) ').signalname']);
-            tmpInport.configs = getBusConfig(inp);
-            for idz=1:length(info)
-                tmpValue = tl_get(inp, ['output(' num2str(idy) ').' info{idz}]);
-                tmpInport.(info{idz}) = getProperValue(inp, tmpValue);
-            end
-            % TODO Fix later, cannot set width in TL_BusInport:s due to "matrix unified output".
-            tmpInport.width = 1;
-
-            tmpInport = modifyEnumStructField(tmpInport);
-
-            busParts = split(tmpInport.name, '.');
-            if ~ismember(busParts{1}, fields(busInPorts))
-                busInPorts.(busParts{1}) = struct();
-                busInPorts.(busParts{1}).(busParts{2}) = tmpInport;
-            elseif ~ismember(busParts{2}, fields(busInPorts.(busParts{1})))
-                busInPorts.(busParts{1}).(busParts{2}) = tmpInport;
-            else
-                printf('Warning: inport %s is already defined', tmpInport.name);
-                printf('         signal will not be added again to the input signal');
-            end
-        end
-    end
-end
-
-function busConfig = getBusConfig(inp)
-    consumerBlks = getConsumerBlocks(inp);
-    codeSwTmp = {};
-    for idx=1:length(consumerBlks)
-        consBlk = consumerBlks(idx);
-        codeSwTmp{idx} = getCodeSwitches(consBlk);
-    end
-    %TODO: Do a better reduction of code switch logics right now only duplicates are removed.
-    busConfig = removeConfigDuplicates(codeSwTmp);
-    isValidConfig = iscell(busConfig) && length(busConfig) == 1 && strcmp(busConfig{1}, 'all');
-    if ~isValidConfig
-        error('Code switching bus inports is currently not supported. All bus inport destinations must be active.')
-    end
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function inPorts = parseInPorts(root_subsystem)
+    % parseInPorts Parse which block data shall be stored per block.
+    %
+    % See also parseModelInfo
+
+    % TODO: Some models have more tha one inport per variable. Should we
+    % check for this?
+    inPorts = struct();
+    info = {'description', 'type', 'unit', 'offset', 'lsb', 'min', 'max', 'class', 'width'};
+
+    normalInPorts = parseTLInPorts(root_subsystem, info);
+    normalFields = fieldnames(normalInPorts);
+    for idx = 1:length(normalFields)
+        inPorts.(normalFields{idx}) = normalInPorts.(normalFields{idx});
+    end
+
+    busInPorts = parseTLBusInPorts(root_subsystem, info);
+    busFields = fieldnames(busInPorts);
+    for idx = 1:length(busFields)
+        inPorts.(busFields{idx}) = busInPorts.(busFields{idx});
+    end
+end
+
+function inPorts = parseTLInPorts(root_subsystem, info)
+    in_ports = find_system(root_subsystem, 'FindAll', 'on',  'SearchDepth', 1, 'MaskType', 'TL_Inport');
+    inPorts = struct();
+    tmpInport = struct();
+    for i=1:length(in_ports)
+        inp = in_ports(i);
+        consumerBlks = getConsumerBlocks(inp);
+        codeSwTmp = {};
+        for j=1:length(consumerBlks)
+            consBlk = consumerBlks(j);
+            codeSwTmp{j} = getCodeSwitches(consBlk);
+        end
+        %TODO: Do a better reduction of code switch logics right now only duplicates are removed.
+        codeSw = removeConfigDuplicates(codeSwTmp);
+        tmpInport.handle = getPath(inp);
+        tmpInport.name = strtrim(getName(inp));
+        tmpInport.configs = codeSw;
+        for idx=1:length(info)
+            tmpValue = tl_get(inp, ['output.' info{idx}]);
+            tmpInport.(info{idx}) = getProperValue(inp, tmpValue);
+        end
+
+        tmpInport = modifyEnumStructField(tmpInport);
+
+        if strcmp(tmpInport.name, fields(inPorts))
+            printf('Warning: inport %s is already defined', tmpInport.name);
+            printf('         signal will not be added again to the input signal');
+        else
+            inPorts.(tmpInport.name) = tmpInport;
+        end
+    end
+end
+
+function busInPorts = parseTLBusInPorts(root_subsystem, info)
+    foundBusInPorts = find_system(root_subsystem, 'FindAll', 'on',  'SearchDepth', 1, 'MaskType', 'TL_BusInport');
+    busInPorts = struct();
+    tmpInport = struct();
+    for idx=1:length(foundBusInPorts)
+        inp = foundBusInPorts(idx);
+        for idy = 1:tl_get(inp, 'numoutputs')
+            tmpInport.handle = getPath(inp);
+            tmpInport.name = tl_get(inp, ['output(' num2str(idy) ').signalname']);
+            tmpInport.configs = getBusConfig(inp);
+            for idz=1:length(info)
+                tmpValue = tl_get(inp, ['output(' num2str(idy) ').' info{idz}]);
+                tmpInport.(info{idz}) = getProperValue(inp, tmpValue);
+            end
+            % TODO Fix later, cannot set width in TL_BusInport:s due to "matrix unified output".
+            tmpInport.width = 1;
+
+            tmpInport = modifyEnumStructField(tmpInport);
+
+            busParts = split(tmpInport.name, '.');
+            if ~ismember(busParts{1}, fields(busInPorts))
+                busInPorts.(busParts{1}) = struct();
+                busInPorts.(busParts{1}).(busParts{2}) = tmpInport;
+            elseif ~ismember(busParts{2}, fields(busInPorts.(busParts{1})))
+                busInPorts.(busParts{1}).(busParts{2}) = tmpInport;
+            else
+                printf('Warning: inport %s is already defined', tmpInport.name);
+                printf('         signal will not be added again to the input signal');
+            end
+        end
+    end
+end
+
+function busConfig = getBusConfig(inp)
+    consumerBlks = getConsumerBlocks(inp);
+    codeSwTmp = {};
+    for idx=1:length(consumerBlks)
+        consBlk = consumerBlks(idx);
+        codeSwTmp{idx} = getCodeSwitches(consBlk);
+    end
+    %TODO: Do a better reduction of code switch logics right now only duplicates are removed.
+    busConfig = removeConfigDuplicates(codeSwTmp);
+    isValidConfig = iscell(busConfig) && length(busConfig) == 1 && strcmp(busConfig{1}, 'all');
+    if ~isValidConfig
+        error('Code switching bus inports is currently not supported. All bus inport destinations must be active.')
+    end
+end

powertrain_build/matlab_scripts/CodeGen/parseIncludeConfigs.m

@@ -1,25 +1,25 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function includeConfigs = parseIncludeConfigs(model, cfgFolder)
-    % parseIncludeConfigs Create include section for configs
-    %
-    % Look in the config folder for related configs.
-    % This is used for models with handwritten c-code,
-    % where the c-code handles nvm-signals, calibration, etc.
-    %
-    % See also parseModelInfo
-    includeConfigs = {};
-    if nargin<1
-        return
-    end
-
-    json_files = dir([cfgFolder '/config_*.json']);
-    for json_file=json_files'
-        if strcmp(['config_' model '.json'], json_file.name)
-            continue
-        end
-        include_start = length('config_') + 1;
-        include_end = length('.json');
-        includeConfigs{end+1} = json_file.name(include_start:end-include_end);
-    end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function includeConfigs = parseIncludeConfigs(model, cfgFolder)
+    % parseIncludeConfigs Create include section for configs
+    %
+    % Look in the config folder for related configs.
+    % This is used for models with handwritten c-code,
+    % where the c-code handles nvm-signals, calibration, etc.
+    %
+    % See also parseModelInfo
+    includeConfigs = {};
+    if nargin<1
+        return
+    end
+
+    json_files = dir([cfgFolder '/config_*.json']);
+    for json_file=json_files'
+        if strcmp(['config_' model '.json'], json_file.name)
+            continue
+        end
+        include_start = length('config_') + 1;
+        include_end = length('.json');
+        includeConfigs{end+1} = json_file.name(include_start:end-include_end);
+    end

powertrain_build/matlab_scripts/CodeGen/parseModelInfo.m

@@ -1,38 +1,38 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function [ output_args ] = parseModelInfo(rootFolder, model, cfgFolder)
-    % parseModelInfo Extract unit-config data from model
-    %
-    % Parse the model and create a structure that can be used to create
-    % a config file for the model.
-    %
-    % See also parseIncludeConfigs parseOutPorts parseInPorts parseCoreIdentifiers
-    %          parseDIDs parseNVM parsePreProcBlks parseCalMeasData
-
-    tic;
-    load_system(model)
-    % Trigger "update model" command.
-    % This was added as a workaround for an inconsistent model.
-    % TODO: Check if it is still needed.
-    % set_param(model, 'SimulationCommand', 'Update');
-    %
-    root_subsystem = topLevelSystem(model);
-    output_args = struct();
-
-    % Version below should match the "config_version" of PyBuild, major must match.
-    % If they don't match, this script (and more?) may require updates.
-    output_args.version = '0.2.1';
-    output_args.includes = parseIncludeConfigs(model, cfgFolder);
-    output_args.integrity_level = getAsilClassification(rootFolder, model);
-    output_args.outports = parseOutPorts(root_subsystem);
-    output_args.inports = parseInPorts(root_subsystem);
-    output_args.core = parseCoreIdentifiers(model);
-    output_args.dids = parseDIDs(model);
-    output_args.nvm = parseNVM(model);
-    output_args.pre_procs = parsePreProcBlks(model);
-    tmp=parseCalMeasData(model);
-    output_args.local_vars = tmp.local_vars;
-    output_args.calib_consts = tmp.calib_consts;
-    toc
-end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function [ output_args ] = parseModelInfo(rootFolder, model, cfgFolder)
+    % parseModelInfo Extract unit-config data from model
+    %
+    % Parse the model and create a structure that can be used to create
+    % a config file for the model.
+    %
+    % See also parseIncludeConfigs parseOutPorts parseInPorts parseCoreIdentifiers
+    %          parseDIDs parseNVM parsePreProcBlks parseCalMeasData
+
+    tic;
+    load_system(model)
+    % Trigger "update model" command.
+    % This was added as a workaround for an inconsistent model.
+    % TODO: Check if it is still needed.
+    % set_param(model, 'SimulationCommand', 'Update');
+    %
+    root_subsystem = topLevelSystem(model);
+    output_args = struct();
+
+    % Version below should match the "config_version" of PyBuild, major must match.
+    % If they don't match, this script (and more?) may require updates.
+    output_args.version = '0.2.1';
+    output_args.includes = parseIncludeConfigs(model, cfgFolder);
+    output_args.integrity_level = getAsilClassification(rootFolder, model);
+    output_args.outports = parseOutPorts(root_subsystem);
+    output_args.inports = parseInPorts(root_subsystem);
+    output_args.core = parseCoreIdentifiers(model);
+    output_args.dids = parseDIDs(model);
+    output_args.nvm = parseNVM(model);
+    output_args.pre_procs = parsePreProcBlks(model);
+    tmp=parseCalMeasData(model);
+    output_args.local_vars = tmp.local_vars;
+    output_args.calib_consts = tmp.calib_consts;
+    toc
+end

powertrain_build/matlab_scripts/CodeGen/parseNVM.m

@@ -1,82 +1,82 @@
-% Copyright 2024 Volvo Car Corporation
-% Licensed under Apache 2.0.
-
-function nvm = parseNVM(model)
-    % parseNVM Parse all the NVM-ram blocks used in the model
-    % and return a struct with which ram-cells there are, and in
-    % which configurations they are present
-    %
-    % See also parseModelInfo
-
-    %TODO: add looking for NVM class in stateflow!!
-
-    outp_and_data_stores = find_system(model, 'FindAll', 'on', 'LookUnderMasks', 'all', ...
-                                       'RegExp', 'On', 'MaskType', 'TL_DataStoreMemory|TL_Outport');
-    unit_delays = find_system(model, 'FindAll', 'on', 'LookUnderMasks', 'all', ...
-                              'RegExp', 'On', 'MaskType', 'TL_UnitDelay');
-
-    nvm = struct();
-    for i=1:length(outp_and_data_stores)
-        dstore_h = outp_and_data_stores(i);
-        class = tl_get(dstore_h,'output.class');
-        name = tl_get(dstore_h,'output.name');
-        if ~isempty(regexp(class, 'CVC_DISP_NVM(_P){0,1}', 'tokens'))
-            nvm = getParams(dstore_h, class, name, nvm);
-        end
-    end
-    for i=1:length(unit_delays)
-        udel_h = unit_delays(i);
-        class_tmp = tl_get(udel_h, 'output.class');
-        state = tl_get(udel_h, 'state.class');
-        if ~isempty(regexp(class_tmp, 'CVC_DISP_NVM(_P){0,1}', 'tokens'))
-            class = class_tmp;
-            name = tl_get(udel_h, 'output.name');
-        elseif ~isempty(state) && ~isempty(regexp(state, 'CVC_DISP_NVM(_P){0,1}', 'tokens'))
-            class = state;
-            name = tl_get(udel_h, 'state.name');
-        else
-            class = '';
-        end
-        if ~isempty(class)
-            nvm = getParams(udel_h, class, name, nvm);
-        end
-    end
-end
-
-function nvm = getParams(blk_handle, class, name, nvm)
-    info = {'description', 'type', 'unit', 'offset', 'lsb', 'min', 'max', 'width'};
-    tmpNvm = struct();
-    tmpNvm.handle = getPath(blk_handle);
-    tmpNvm.name = getName(blk_handle, name);
-    config = getCodeSwitches(blk_handle);
-    if ismember(tmpNvm.name, fields(nvm))
-        % Merge new configs with old
-        tmpConfigs = nvm.(tmpNvm.name).configs;
-        tmpConfigs{end+1} = config;
-        tmpNvm.configs = removeConfigDuplicates(tmpConfigs);
-    else
-        % Always require nvm configs to be formatted in or+and+expression syntax
-        tmpNvm.configs = {config};
-    end
-    tmpNvm.class = class;
-    for idx=1:length(info)
-        tmpNvm.(info{idx}) = chkNan(tl_get(blk_handle, ['output.' info{idx}]));
-    end
-    % Overwrite potential old nvm block with new configs
-    nvm.(tmpNvm.name) = tmpNvm;
-end
-
-function res = chkNan(value)
-% Function which replaces NaN or empty fields with '-'
-    if ~ischar(value)
-        if isnan(value)
-            res = '-';
-        elseif isempty(value)
-            res = '-';
-        else
-            res = num2str(value);
-        end
-    else
-        res = value;
-    end
+% Copyright 2024 Volvo Car Corporation
+% Licensed under Apache 2.0.
+
+function nvm = parseNVM(model)
+    % parseNVM Parse all the NVM-ram blocks used in the model
+    % and return a struct with which ram-cells there are, and in
+    % which configurations they are present
+    %
+    % See also parseModelInfo
+
+    %TODO: add looking for NVM class in stateflow!!
+
+    outp_and_data_stores = find_system(model, 'FindAll', 'on', 'LookUnderMasks', 'all', ...
+                                       'RegExp', 'On', 'MaskType', 'TL_DataStoreMemory|TL_Outport');
+    unit_delays = find_system(model, 'FindAll', 'on', 'LookUnderMasks', 'all', ...
+                              'RegExp', 'On', 'MaskType', 'TL_UnitDelay');
+
+    nvm = struct();
+    for i=1:length(outp_and_data_stores)
+        dstore_h = outp_and_data_stores(i);
+        class = tl_get(dstore_h,'output.class');
+        name = tl_get(dstore_h,'output.name');
+        if ~isempty(regexp(class, 'CVC_DISP_NVM(_P){0,1}', 'tokens'))
+            nvm = getParams(dstore_h, class, name, nvm);
+        end
+    end
+    for i=1:length(unit_delays)
+        udel_h = unit_delays(i);
+        class_tmp = tl_get(udel_h, 'output.class');
+        state = tl_get(udel_h, 'state.class');
+        if ~isempty(regexp(class_tmp, 'CVC_DISP_NVM(_P){0,1}', 'tokens'))
+            class = class_tmp;
+            name = tl_get(udel_h, 'output.name');
+        elseif ~isempty(state) && ~isempty(regexp(state, 'CVC_DISP_NVM(_P){0,1}', 'tokens'))
+            class = state;
+            name = tl_get(udel_h, 'state.name');
+        else
+            class = '';
+        end
+        if ~isempty(class)
+            nvm = getParams(udel_h, class, name, nvm);
+        end
+    end
+end
+
+function nvm = getParams(blk_handle, class, name, nvm)
+    info = {'description', 'type', 'unit', 'offset', 'lsb', 'min', 'max', 'width'};
+    tmpNvm = struct();
+    tmpNvm.handle = getPath(blk_handle);
+    tmpNvm.name = getName(blk_handle, name);
+    config = getCodeSwitches(blk_handle);
+    if ismember(tmpNvm.name, fields(nvm))
+        % Merge new configs with old
+        tmpConfigs = nvm.(tmpNvm.name).configs;
+        tmpConfigs{end+1} = config;
+        tmpNvm.configs = removeConfigDuplicates(tmpConfigs);
+    else
+        % Always require nvm configs to be formatted in or+and+expression syntax
+        tmpNvm.configs = {config};
+    end
+    tmpNvm.class = class;
+    for idx=1:length(info)
+        tmpNvm.(info{idx}) = chkNan(tl_get(blk_handle, ['output.' info{idx}]));
+    end
+    % Overwrite potential old nvm block with new configs
+    nvm.(tmpNvm.name) = tmpNvm;
+end
+
+function res = chkNan(value)
+% Function which replaces NaN or empty fields with '-'
+    if ~ischar(value)
+        if isnan(value)
+            res = '-';
+        elseif isempty(value)
+            res = '-';
+        else
+            res = num2str(value);
+        end
+    else
+        res = value;
+    end
 end