From 3eaccf31c3e5f322395eccc38918b04df4ae35ed Mon Sep 17 00:00:00 2001 From: Pagadarai Date: Mon, 8 Apr 2024 09:26:23 -0400 Subject: [PATCH] MATLAB version upgraded to R2023b Signed-off-by: Pagadarai --- +adi/Version.m | 4 ++-- CI/scripts/Makefile | 2 +- CI/scripts/synth_designs.sh | 2 +- Jenkinsfile | 4 ++-- JenkinsfileCron | 4 ++-- JenkinsfileHW | 2 +- README.md | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/+adi/Version.m b/+adi/Version.m index 01e5a241..2025e343 100644 --- 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.2'; + MATLAB = 'R2023b'; + Release = '23.2.1'; AppName = 'Analog Devices, Inc. High-Speed Converter Toolbox'; ToolboxName = 'HighSpeedConverterToolbox'; ToolboxNameShort = 'hsx'; diff --git a/CI/scripts/Makefile b/CI/scripts/Makefile index 0d4f5619..3f263203 100644 --- 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 index 28c93bea..af4fc777 100644 --- 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/Jenkinsfile b/Jenkinsfile index fdc10f0f..b2f249dd 100644 --- 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' //////////////////////////// @@ -69,7 +69,7 @@ def board = 'ad9208'; def nodeLabel = 'baremetal && high_memory'; deployments[board] = { node(nodeLabel) { cstage("Baremetal HDL Test", "", flags) { - 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 { cstage("AD9208 HDL Test", "", flags) { echo "Node: ${env.NODE_NAME}" diff --git a/JenkinsfileCron b/JenkinsfileCron index 6db99a63..522ef075 100644 --- 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' //////////////////////////// @@ -47,7 +47,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 index c86cf364..372cde2c 100644 --- 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/HighSpeedConverterToolbox.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 index 6fbd30ea..dde57230 100644 --- 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 | | +| 2021_R2 | R2023b | | 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 for certain releases of MATLAB. This does not mean older releases will not work but they are not maintained. Currently supported tools are: -- Bug fixes: MATLAB R2022a with Vivado 2021.1 -- Bug fixes and new features: MATLAB R2022b with Vivado 2021.2 +- Bug fixes: MATLAB R2022b with Vivado 2021.1 +- Bug fixes and new features: MATLAB R2023b with Vivado 2021.2 ## Support and Documentation