Skip to content

Commit

Permalink
Merge pull request #157 from analogdevicesinc/R2023b_release
Browse files Browse the repository at this point in the history
  • Loading branch information
tfcollins authored Apr 11, 2024
2 parents f8a985a + 8faf0ee commit b5b2f55
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 20 deletions.
4 changes: 2 additions & 2 deletions +adi/Version.m
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
52 changes: 52 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Build Toolbox

on: [push]

jobs:
build:
name: Build Toolbox
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v3
with:
submodules: recursive
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: '3.10'
- name: Organize Toolbox Dependencies
run: |
make -C ./CI/scripts build
pip3 install -r CI/gen_doc/requirements_doc.txt
make -C CI/gen_doc doc
- name: Set up MATLAB
uses: matlab-actions/setup-matlab@v1
with:
release: R2023b
- name: Compile Toolbox
uses: matlab-actions/run-command@v1
with:
command: cd('CI/scripts');genTlbx(1);exit()

- name: Move generated .mltbx file
run: |
mkdir toolbox
cp *.mltbx toolbox
- name: Save generated .mltbx file
uses: actions/upload-artifact@v3
with:
name: HighSpeedConverterToolboxInstaller
path: toolbox

- name: Post development build to GH releases page
uses: "marvinpinto/action-automatic-releases@latest"
if: github.ref == 'refs/heads/master'
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: "latest"
prerelease: true
title: "Latest Development Build"
files: toolbox
2 changes: 1 addition & 1 deletion CI/gen_doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# -- Project information -----------------------------------------------------

project = 'Transceiver Toolbox'
project = 'High-Speed Converter Toolbox'
copyright = '2021, Travis F. Collins'
author = 'Travis F. Collins'

Expand Down
4 changes: 2 additions & 2 deletions CI/gen_doc/source/index.tmpl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.. Transceiver Toolbox documentation master file, created by
.. High-Speed Converter Toolbox documentation master file, created by
sphinx-quickstart on Sat Nov 20 13:31:10 2021.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.

Welcome to Transceiver Toolbox's documentation!
Welcome to High-Speed Converter Toolbox's documentation!
===============================================

.. raw:: html
Expand Down
2 changes: 1 addition & 1 deletion CI/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SHELL := /bin/bash
MLFLAGS := -nodisplay -nodesktop -nosplash

ifeq ($(MLRELEASE),)
MLRELEASE := R2022b
MLRELEASE := R2023b
endif

ifeq ($(HDLBRANCH),)
Expand Down
6 changes: 3 additions & 3 deletions CI/scripts/bsp_noexamples.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<param.authnamewatermark>Travis Collins</param.authnamewatermark>
<param.email>[email protected]</param.email>
<param.company>Analog Devices, Inc</param.company>
<param.summary>Board support package for HDL targeting and data streaming from Analog Devices transceivers.</param.summary>
<param.description>Scripts and tools created by ADI to be used with MATLAB and Simulink with ADI transceivers
<param.summary>Board support package for HDL targeting and data streaming from Analog Devices high-speed data converters.</param.summary>
<param.description>Scripts and tools created by ADI to be used with MATLAB and Simulink with ADI high-speed data converters
Documentation: https://wiki.analog.com/resources/eval/user-guides/ad-fmcomms2-ebz/software/matlab_bsp
Support: https://ez.analog.com/</param.description>
<param.screenshot>__REPO-ROOT__/CI/doc/ADI_Logo_AWP_Large.png</param.screenshot>
<param.version>__VERSION__</param.version>
<param.output>${PROJECT_ROOT}/AnalogDevicesTransceiverToolbox.mltbx</param.output>
<param.output>${PROJECT_ROOT}/AnalogDevicesHighSpeedConverterToolbox.mltbx</param.output>
<param.products.name>
<item>MATLAB</item>
<item>Simulink</item>
Expand Down
2 changes: 1 addition & 1 deletion CI/scripts/synth_designs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MLFLAGS="-nodisplay -nodesktop -nosplash"

if [ -z "$MLRELEASE" ]
then
MLRELEASE=R2022b
MLRELEASE=R2023b
fi

MLPATH=/usr/local/MATLAB
Expand Down
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
flags = gitParseFlags()

dockerConfig = getDockerConfig(['MATLAB','Vivado'], matlabHSPro=false)
dockerConfig.add("-e MLRELEASE=R2022b")
dockerConfig.add("-e MLRELEASE=R2023b")
dockerHost = 'docker'

////////////////////////////

hdlBranches = ['master','hdl_2021_r2']
hdlBranches = ['main','hdl_2021_r2']

stage("Build Toolbox") {
dockerParallelBuild(hdlBranches, dockerHost, dockerConfig) {
Expand Down Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions JenkinsfileCron
Original file line number Diff line number Diff line change
@@ -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'

////////////////////////////
Expand Down Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions JenkinsfileHW
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down Expand Up @@ -80,4 +80,4 @@ lock(label: 'adgt_test_harness_boards') {

// // Go go
harness.run_stages()
}
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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="http://swdownloads.analog.com/cse/toolboxes/hsx/master/AnalogDevicesHighSpeedConverterToolbox_v22.2.2.mltbx"><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="http://swdownloads.analog.com/cse/toolboxes/hsx/master/AnalogDevicesHighSpeedConverterToolbox_v23.2.1.mltbx"><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 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

Expand Down

0 comments on commit b5b2f55

Please sign in to comment.