Merge pull request #177 from analogdevicesinc/R2023b_release

analogdevicesinc · Apr 2, 2024 · 5674099 · 5674099
2 parents 6a91d5c + 29c6c0b
commit 5674099
Show file tree

Hide file tree

Showing 16 changed files with 103 additions and 32 deletions.
diff --git a/+adi/Contents.m b/+adi/Contents.m
@@ -1,5 +1,5 @@
 % Analog Devices, Inc. Transceiver Toolbox
-% Version 22.1.1 (R2022b)
+% Version 23.2.1 (R2023b)
 %
 % ==== Table of Contents (TOC) ====
 %

diff --git a/+adi/Version.m b/+adi/Version.m
@@ -4,8 +4,8 @@
     properties(Constant)
         HDL = 'hdl_2021_r2';
         Vivado = '2021.2';
-        MATLAB = 'R2022b';
-        Release = '22.2.3';
+        MATLAB = 'R2023b';
+        Release = '23.2.1';
         AppName = 'Analog Devices, Inc. Transceiver Toolbox';
         ToolboxName = 'TransceiverToolbox';
         ToolboxNameShort = 'trx';

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up MATLAB
         uses: matlab-actions/setup-matlab@v1
         with:
-            release: R2022b
+            release: R2023b
       - name: Compile Toolbox
         uses: matlab-actions/run-command@v1
         with:

diff --git a/CI/scripts/Makefile b/CI/scripts/Makefile
@@ -8,7 +8,7 @@ SHELL := /bin/bash
 MLFLAGS := -nodisplay -nodesktop -nosplash
 
 ifeq ($(MLRELEASE),)
-MLRELEASE := R2022b
+MLRELEASE := R2023b
 endif
 
 ifeq ($(HDLBRANCH),)

diff --git a/CI/scripts/synth_designs.sh b/CI/scripts/synth_designs.sh
@@ -5,7 +5,7 @@ MLFLAGS="-nodisplay -nodesktop -nosplash"
 
 if [ -z "$MLRELEASE" ]
 then
-	MLRELEASE=R2022b
+	MLRELEASE=R2023b
 fi
 
 MLPATH=/usr/local/MATLAB

diff --git a/CI/scripts/targeting_designs.sh b/CI/scripts/targeting_designs.sh
@@ -4,7 +4,7 @@ MLFLAGS="-nodisplay -nodesktop -nosplash"
 
 if [ -z "$MLRELEASE" ]
 then
-	MLRELEASE=R2022b
+	MLRELEASE=R2023b
 fi
 if [ -z "$DEMO" ]
 then

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,7 @@
 flags = gitParseFlags()
 
 dockerConfig = getDockerConfig(['MATLAB','Vivado'], matlabHSPro=false)
-dockerConfig.add("-e MLRELEASE=R2022b")
+dockerConfig.add("-e MLRELEASE=R2023b")
 dockerHost = 'docker'
 
 ////////////////////////////
@@ -91,7 +91,7 @@ for (int i=0; i < demoNames.size(); i++) {
         nodeLabel = 'baremetal && high_memory';
     deployments[demo] = { node(nodeLabel) {
         stage("Demo Tests") {
-            withEnv(['DEMO='+demo,'MLRELEASE=R2022b','HDLBRANCH=hdl_2021_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
+            withEnv(['DEMO='+demo,'MLRELEASE=R2023b','HDLBRANCH=hdl_2021_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
                 try {
                     stage(demo) {
                         echo "Node: ${env.NODE_NAME}"
@@ -114,6 +114,17 @@ parallel deployments
 
 /////////////////////////////////////////////////////
 
+node('baremetal') {
+	stage("NonHW Tests") {
+        stage("NonHW") {
+            unstash "builtSources"
+            sh 'make -C ./CI/scripts run_NonHWTests'
+        }
+    }
+}
+
+/////////////////////////////////////////////////////
+
 appNames = ['lte_pa_app']
 
 cstage("Build Deployable Apps", "", flags) {

diff --git a/JenkinsfileCron b/JenkinsfileCron
@@ -1,7 +1,7 @@
 @Library('tfc-lib') _
 
 dockerConfig = getDockerConfig(['MATLAB','Vivado'], matlabHSPro=false)
-dockerConfig.add("-e MLRELEASE=R2022b")
+dockerConfig.add("-e MLRELEASE=R2023b")
 dockerHost = 'docker'
 
 ////////////////////////////
@@ -56,7 +56,7 @@ for (int i=0; i < boardNames.size(); i++) {
         nodeLabel = 'baremetal && high_memory';
     deployments[board] = { node(nodeLabel) {
         stage("Synthesis Tests") {
-            withEnv(['BOARD='+board,'MLRELEASE=R2022b','HDLBRANCH=hdl_2021_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
+            withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2021_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) {
                 try {
                     stage("Synth") {
                         echo "Node: ${env.NODE_NAME}"

diff --git a/JenkinsfileHW b/JenkinsfileHW
@@ -17,7 +17,7 @@ lock(label: 'adgt_test_harness_boards') {
     // harness.set_env('telemetry_repo', 'http://gateway.englab:3000/mirrors/telemetry.git')
     // harness.set_env('telemetry_branch', 'master')
     harness.set_env('matlab_repo', 'https://github.com/analogdevicesinc/TransceiverToolbox.git') // Not necessary when using checkout scm
-    harness.set_env('matlab_release','R2022b')
+    harness.set_env('matlab_release','R2023b')
     harness.set_env('matlab_license','network')
     harness.set_matlab_timeout('8m')
 

diff --git a/README.md b/README.md
@@ -12,15 +12,15 @@ As with many open source packages, we use [GitHub](https://github.com/analogdevi
 
 | HDL Branch        | MATLAB Release |  Installer Package  |
 |:-----------------:|:--------------:|:-------------------:|
-| 2021_R2           | R2022b         | <a href="https://github.com/analogdevicesinc/TransceiverToolbox/releases/tag/latest"><img src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" data-canonical-src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" height="40" /></a>|
+| 2021_R2           | R2023b         | <a href="https://github.com/analogdevicesinc/TransceiverToolbox/releases/tag/latest"><img src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" data-canonical-src="https://upload.wikimedia.org/wikipedia/commons/2/21/Matlab_Logo.png" height="40" /></a>|
 
 If you use it, and like it - please let us know. If you use it, and hate it - please let us know that too.
 
 ## Supported Tools and Releases
 
 We provide support across two releases of MATLAB. This does not mean older releases will not work but they are not maintained. Currently supported tools are:
-- Bug fixes only: MATLAB R2022a with Vivado 2021.1
-- Bug fixes and new features: MATLAB R2022b with Vivado 2021.2
+- Bug fixes only: MATLAB R2022b with Vivado 2021.2
+- Bug fixes and new features: MATLAB R2023b with Vivado 2021.2
 
 ## Support and Documentation
 

diff --git a/hdl/vendor/AnalogDevices/Contents.m b/hdl/vendor/AnalogDevices/Contents.m
@@ -1,2 +1,2 @@
 % HDL Coder BSP: Analog Devices Inc
-% Version 22.2.2 (R2022b) 24-March-2023
+% Version 23.2.1 (R2023b) 21-March-2024
diff --git a/info.xml b/info.xml
@@ -8,7 +8,7 @@
     <!-- Supply the following six elements in the order specified -->
     <!-- (Required) Release of MATLAB. Not currently used but required -->
     <!-- to parse the file -->
-    <matlabrelease>R2022b</matlabrelease>
+    <matlabrelease>R2023b</matlabrelease>
     <!-- (Required) Title of toolbox. Appears in the Contents pane -->
     <name>Analog Devices, Inc. Transceiver Toolbox</name>
     <!-- (Required) Label for the toolbox. pick one: -->

diff --git a/test/DemoTests.m b/test/DemoTests.m
@@ -94,6 +94,8 @@ function setupVivado(vivado)
                         vivado = '2021.1';
                     case '(R2022b)'
                         vivado = '2021.2';
+                    case '(R2023b)'
+                        vivado = '2021.2';
                 end
             end
             if ispc

diff --git a/test/NonHWTest.m b/test/NonHWTest.m
@@ -1,21 +1,12 @@
 classdef NonHWTest < matlab.unittest.TestCase
-
     properties(TestParameter)
-        rootClasses = {'AD9361','AD9363','AD9364'...
-            'AD9371','ADRV9009','ADRV9002'}
-        children = {'Rx','Tx'};
+        rootClasses = getClasses();
     end
-
-
-    methods (Test)
 
-        function call_constructors(testCase,rootClasses,children)
-            sdr = eval(['adi.',rootClasses,'.',children,'()']);
-            testCase.assertEqual(class(sdr),['adi.',rootClasses,'.',children]);
+    methods (Test)
+        function call_constructors(testCase,rootClasses)
+            sdr = eval(['adi.',rootClasses,'()']);
+            testCase.assertEqual(class(sdr),['adi.',rootClasses]);
         end
-
     end
-
-
-end
-
+end
diff --git a/test/getClasses.m b/test/getClasses.m
@@ -0,0 +1,28 @@
+function sysobjs = getClasses()
+    cpwd = pwd;
+    [filepath,~,~] = fileparts(mfilename('fullpath'));
+    cd(filepath)
+    cd('..');
+
+    filelist = dir(fullfile('+adi', ['**',filesep,'/*.*']));
+
+    sysobjs = {};
+
+    for fi = 1:length(filelist)
+        name = filelist(fi).name;
+        if strcmp(name,'Rx.m') || strcmp(name,'Tx.m')
+            ffile = [filelist(fi).folder, filesep, name];
+            parts = strsplit(ffile,filesep);
+            name = parts{end-1}; name = name(2:end);
+            if strcmp(name,'common')
+                continue;
+            end
+            if strcmp(name,'AD916x')
+                continue
+            end
+            rxtx = parts{end}; rxtx = rxtx(1:end-2);
+            sysobjs = [sysobjs(:)', {[name,'.',rxtx]}];
+        end
+    end
+    cd(cpwd);
+end
diff --git a/test/runNonHWTest.m b/test/runNonHWTest.m
@@ -0,0 +1,39 @@
+function suite = runNonHWTest()
+
+import matlab.unittest.TestRunner;
+import matlab.unittest.TestSuite;
+import matlab.unittest.plugins.TestReportPlugin;
+import matlab.unittest.plugins.XMLPlugin
+import matlab.unittest.plugins.DiagnosticsValidationPlugin
+
+suite = testsuite({'NonHWTest'});
+xmlFile = 'BSPDemoTests.xml';
+
+
+try
+    runner = matlab.unittest.TestRunner.withTextOutput('OutputDetail',1);
+    runner.addPlugin(DiagnosticsValidationPlugin)
+
+    xmlFile = 'BSPDemoTests.xml';
+    plugin = XMLPlugin.producingJUnitFormat(xmlFile);
+    runner.addPlugin(plugin);
+
+    results = runner.run(suite);
+
+    t = table(results);
+    disp(t);
+    disp(repmat('#',1,80));
+    for test = results
+        if test.Failed
+            disp(test.Name);
+        end
+    end
+catch e
+    disp(getReport(e,'extended'));
+    bdclose('all');
+    exit(1);
+end
+
+save(['BSPInstallerTest_',datestr(now,'dd_mm_yyyy-HH:MM:SS'),'.mat'],'t');
+bdclose('all');
+exit(any([results.Failed]));