Merge pull request #30 from sync2brain/pack_sg

Attach and package Speedgoat dependencies on demand

.gitignore

@@ -1,6 +1,6 @@
 work
 toolbox/html
-toolbox/dependencies/firmware
+toolbox/dependencies
 
 # Autosave files
 *.asv

buildUtilities/releaseTask.m

@@ -17,6 +17,9 @@
     warning('Share folder not found. Firmware dependencies will not be packaged in toolbox.');
 end
 
+% Update Speedgoat dependencies
+updateSGdeps;
+
 % Remove v from toolboxVersion
 options.toolboxVersion = erase(toolboxVersion,"v");
 

buildUtilities/updateSGdeps.m

@@ -2,18 +2,24 @@
 
 projObj = currentProject;
 sgToolsPath = fileparts(which('updateSGtools.p','-all'));
-sgToolsPath = sgToolsPath{end}; % Speedgoat I/O blockset path is always below the local project
+if isstring(sgToolsPath)
+    sgToolsPath = sgToolsPath{end}; % Speedgoat I/O blockset path is always below the local project
+end
 
 fprintf('Updating Speedgoat dependencies in local project from %s...\n',sgToolsPath);
 
 sgTools = dir(sgToolsPath);
 sgTools = sgTools(~[sgTools.isdir]);
 
+destFolder = fullfile(projObj.RootFolder,'toolbox/dependencies/sg',matlabRelease.Release);
+if ~isfolder(destFolder)
+    mkdir(destFolder);
+end
+
 for i = 1:numel(sgTools)
-    copyfile(fullfile(sgTools(i).folder,sgTools(i).name),...
-        fullfile(projObj.RootFolder,'toolbox/dependencies/sg/'));
+    copyfile(fullfile(sgTools(i).folder,sgTools(i).name),destFolder);
 end
 
-fprintf('Dependencies updated. Please commit and push changes to Git.\n');
+fprintf('Speedgoat dependencies updated in toolbox.\n');
 
 end

resources/project/-yj-zgdEElpZjlogbAXxP8XBgk4/NdmgVI2224JjgwhiWss8erhgOUEd.xml → resources/project/-yj-zgdEElpZjlogbAXxP8XBgk4/3aKsr_CsdwkFmajWCsUtBCIVdG0p.xml

@@ -1,2 +1,2 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Info/>
+<Info location=".gitkeep" type="File"/>

resources/project/EEtUlUb-dLAdf0KpMVivaUlztwA/GyUn0X0AF-2zCuh99CWbAYiuc4op.xml

@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info location="176e4c23-7d69-4d8a-99e4-6290316f4773" type="Reference"/>

toolbox/bossdevice.m

@@ -56,6 +56,8 @@ function clearPersonalSettings()
                 ipAddress {mustBeTextScalar} = '';
             end
 
+            toolboxPath = fileparts(which(mfilename));
+
             % Initialize toolbox settings
             s = settings;
 
@@ -81,6 +83,16 @@ function clearPersonalSettings()
                 ipAddress = s.bossdeviceAPI.TargetSettings.TargetIPAddress.FactoryValue;
             end
 
+            % Check and enable built-in Speedgoat dependencies
+            if ~exist('updateSGtools.p','file')
+                addpath(fullfile(toolboxPath,'dependencies','sg',matlabRelease.Release));
+            elseif exist('speedgoat','file')
+                % Using own full installation of Speedgoat I/O Blockset
+                % fprintf('Using own full installation of Speedgoat I/O Blockset v%s.\n',speedgoat.version);
+            else
+                error('Speedgoat dependencies not found. Please search out to technical support.');
+            end
+
             % Use default target if not passing any input argument
             tgs = slrealtime.Targets;
             if ~contains(tgs.getTargetNames,targetName,'IgnoreCase',true)
@@ -98,7 +110,6 @@ function clearPersonalSettings()
             end
 
             % Search firmware binary and prompt user if not found in MATLAB path
-            toolboxPath = fileparts(which(mfilename));
             firmwareSharePath = fullfile(toolboxPath,'dependencies','firmware',matlabRelease.Release,[obj.appName,'.mldatx']);
 
             if exist([obj.appName,'.mldatx'],"file")