Skip to content

Commit

Permalink
Merge pull request #20 from analogdevicesinc/R2020a_init
Browse files Browse the repository at this point in the history
Update to R2020a
  • Loading branch information
tfcollins authored Aug 19, 2020
2 parents 9d86787 + 4ed4123 commit 20cbc50
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion +adi/Contents.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
% Analog Devices, Inc. High Speed Converter Toolbox
% Version 19.2.1 (R2019b)
% Version 20.1.1 (R2020a)
%
% ==== Table of Contents (TOC) ====
%
Expand Down
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_2018_r2';
Vivado = '2018.2';
MATLAB = 'R2019b';
Release = '19.2.1';
MATLAB = 'R2020a';
Release = '20.1.1';
AppName = 'Analog Devices, Inc. High-Speed Converter Toolbox';
ToolboxName = 'HighSpeedConverterToolbox';
ToolboxNameShort = 'hsx';
Expand Down
Binary file modified CI/doc/SupportedHardware.mlx
Binary file not shown.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@Library('tfc-lib') _

dockerConfig = getDockerConfig(['MATLAB','Vivado'])
dockerConfig.add("-e MLRELEASE=R2019b")
dockerConfig.add("-e MLRELEASE=R2020a")
dockerHost = 'docker'

////////////////////////////
Expand Down
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 |
|:------------------:|:--------------:|:-------------------:|
| 2018_R2 | R2019b | <a href="http://swdownloads.analog.com/cse/toolboxes/trx/master/AnalogDevicesHighSpeedConverterToolbox_v19.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>|
| 2018_R2 | R2020a | <a href="http://swdownloads.analog.com/cse/toolboxes/trx/master/AnalogDevicesHighSpeedConverterToolbox_v20.1.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 R2019a with Vivado 2018.2
- Bug fixes and new features: MATLAB R2019b with Vivado 2018.2
- Bug fixes: MATLAB R2019b with Vivado 2018.2
- Bug fixes and new features: MATLAB R2020a with Vivado 2018.2

## Support and Documentation

Expand Down
10 changes: 5 additions & 5 deletions doc/Buffers.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/Examples.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2019b"><title>ADI High Speed Converter Toolbox Examples</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2020a"><title>ADI High Speed Converter Toolbox Examples</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
.S1 { margin: 20px 10px 5px 4px; padding: 0px; line-height: 20px; min-height: 0px; white-space: pre-wrap; color: rgb(60, 60, 60); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 20px; font-weight: bold; text-align: left; }
.S2 { margin: 10px 0px 20px; padding-left: 0px; font-family: Helvetica, Arial, sans-serif; font-size: 14px; }
.S3 { margin-left: 56px; line-height: 21px; min-height: 0px; text-align: left; white-space: pre-wrap; }</style></head><body><div class = rtcContent><h1 class = 'S0'><span>ADI High Speed Converter Toolbox Examples</span></h1><h2 class = 'S1' id = 'H_3692D52B' ><span>Streaming Examples</span></h2><ul class = 'S2'><li class = 'S3'><span>DAQ2 Basic Streaming</span></li></ul></div>
Expand Down
2 changes: 1 addition & 1 deletion doc/Support.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2019b"><title>ADI High Speed Converter Toolbox Support</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2020a"><title>ADI High Speed Converter Toolbox Support</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
.S1 { margin: 2px 10px 9px 4px; padding: 0px; line-height: 21px; min-height: 0px; white-space: pre-wrap; color: rgb(0, 0, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 14px; font-weight: normal; text-align: left; }
.S2 { margin: 10px 0px 20px; padding-left: 0px; font-family: Helvetica, Arial, sans-serif; font-size: 14px; }
.S3 { margin-left: 56px; line-height: 21px; min-height: 0px; text-align: left; white-space: pre-wrap; }</style></head><body><div class = rtcContent><h1 class = 'S0'><span>ADI High Speed Converter Toolbox Support</span></h1><div class = 'S1'><span>Support is provided online through the </span><a href = "https://ez.analog.com/"><span>EngineerZone</span></a><span> forums. If you have questions related to the hardware itself outside of this BSP, contact your local FAE or ask on the forums.</span></div><div class = 'S1'><span>Question regarding specific aspect of the BSP should be asked in the following places:</span></div><ul class = 'S2'><li class = 'S3'><a href = "https://ez.analog.com/linux-device-drivers/linux-software-drivers"><span>Linux Software Drivers</span></a><span> for questions on the BSP itself</span></li><li class = 'S3'><a href = "https://ez.analog.com/linux-device-drivers/linux-software-drivers"><span>Linux Software Drivers</span></a><span> for libiio and iio driver questions</span></li></ul></div>
Expand Down
6 changes: 4 additions & 2 deletions doc/SupportedHardware.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2019b"><title>ADI High Speed Converter Toolbox Supported Hardware</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2020a"><title>ADI High Speed Converter Toolbox Supported Hardware</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
.S1 { margin: 2px 10px 9px 4px; padding: 0px; line-height: 21px; min-height: 0px; white-space: pre-wrap; color: rgb(0, 0, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 14px; font-weight: normal; text-align: left; }
.S2 { margin: 10px 0px 20px; padding-left: 0px; font-family: Helvetica, Arial, sans-serif; font-size: 14px; }
.S3 { margin-left: 56px; line-height: 21px; min-height: 0px; text-align: left; white-space: pre-wrap; }
.S4 { margin: 20px 10px 5px 4px; padding: 0px; line-height: 20px; min-height: 0px; white-space: pre-wrap; color: rgb(60, 60, 60); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 20px; font-weight: bold; text-align: left; }</style></head><body><div class = rtcContent><h1 class = 'S0'><span>ADI High Speed Converter Toolbox Supported Hardware</span></h1><div class = 'S1'><span>Almost any ADI hardware that has an IIO supported driver can stream data into MATLAB or Simulink. We have specific implementations of the following devices, boards, or chips that support streaming:</span></div><ul class = 'S2'><li class = 'S3'><a href = "https://www.analog.com/en/products/ad9144.html"><span>AD9144</span></a></li><li class = 'S3'><a href = "https://www.analog.com/en/products/ad9680.html"><span>AD9680</span></a></li><li class = 'S3'><a href = "https://www.analog.com/en/products/ad9467.html"><span>AD9467</span></a></li></ul><h2 class = 'S4' id = 'H_D3E4334B' ><span>System Requirements</span></h2><div class = 'S1'><span>Specific examples will require different toolboxes. The examples will require:</span></div><ul class = 'S2'><li class = 'S3'><a href = "https://www.mathworks.com/products/dsp-system.html"><span>DSP System Toolbox</span></a></li></ul><div class = 'S1'><span>All device I/O support with System objects or Blocks requires:</span></div><ul class = 'S2'><li class = 'S3'><a href = "https://www.mathworks.com/hardware-support/zynq-sdr.html"><span>Zynq SDR Support from Communications Toolbox</span></a></li></ul></div>
.S4 { margin: 20px 10px 5px 4px; padding: 0px; line-height: 20px; min-height: 0px; white-space: pre-wrap; color: rgb(60, 60, 60); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 20px; font-weight: bold; text-align: left; }</style></head><body><div class = rtcContent><h1 class = 'S0'><span>ADI High Speed Converter Toolbox Supported Hardware</span></h1><div class = 'S1'><span>Almost any ADI hardware that has an IIO supported driver can stream data into MATLAB or Simulink. We have specific implementations of the following devices, boards, or chips that support streaming:</span></div><ul class = 'S2'><li class = 'S3'><a href = "https://www.analog.com/en/products/ad9081.html"><span>AD9081</span></a></li><li class = 'S3'><a href = "https://wiki.analog.com/resources/eval/user-guides/quadmxfe"><span>QuadMxFE</span></a></li><li class = 'S3'><a href = "https://www.analog.com/en/products/ad9144.html"><span>AD9144</span></a></li><li class = 'S3'><a href = "https://www.analog.com/en/products/ad9680.html"><span>AD9680</span></a></li><li class = 'S3'><a href = "https://www.analog.com/en/products/ad9467.html"><span>AD9467</span></a></li></ul><h2 class = 'S4' id = 'H_D3E4334B' ><span>System Requirements</span></h2><div class = 'S1'><span>Specific examples will require different toolboxes. The examples will require:</span></div><ul class = 'S2'><li class = 'S3'><a href = "https://www.mathworks.com/products/dsp-system.html"><span>DSP System Toolbox</span></a></li></ul><div class = 'S1'><span>All device I/O support with System objects or Blocks requires:</span></div><ul class = 'S2'><li class = 'S3'><a href = "https://www.mathworks.com/hardware-support/zynq-sdr.html"><span>Zynq SDR Support from Communications Toolbox</span></a></li></ul></div>
<br>
<!--
##### SOURCE BEGIN #####
Expand All @@ -12,6 +12,8 @@
% MATLAB or Simulink. We have specific implementations of the following devices,
% boards, or chips that support streaming:
%%
% * <https://www.analog.com/en/products/ad9081.html AD9081>
% * <https://wiki.analog.com/resources/eval/user-guides/quadmxfe QuadMxFE>
% * <https://www.analog.com/en/products/ad9144.html AD9144>
% * <https://www.analog.com/en/products/ad9680.html AD9680>
% * <https://www.analog.com/en/products/ad9467.html AD9467>
Expand Down
8 changes: 4 additions & 4 deletions doc/SystemObjects.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2019b"><title>ADI High Speed Converter Toolbox System Objects For Device I/O</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2020a"><title>ADI High Speed Converter Toolbox System Objects For Device I/O</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
.S1 { margin: 2px 10px 9px 4px; padding: 0px; line-height: 21px; min-height: 0px; white-space: pre-wrap; color: rgb(0, 0, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 14px; font-weight: normal; text-align: left; }
.CodeBlock { background-color: #F7F7F7; margin: 10px 0 10px 0;}
.S2 { border-left: 1px solid rgb(233, 233, 233); border-right: 1px solid rgb(233, 233, 233); border-top: 1px solid rgb(233, 233, 233); border-bottom: 0px none rgb(0, 0, 0); border-radius: 4px 4px 0px 0px; padding: 6px 45px 0px 13px; line-height: 16.996px; min-height: 18px; white-space: nowrap; color: rgb(0, 0, 0); font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 14px; }
.S3 { border-left: 1px solid rgb(233, 233, 233); border-right: 1px solid rgb(233, 233, 233); border-top: 0px none rgb(0, 0, 0); border-bottom: 0px none rgb(0, 0, 0); border-radius: 0px; padding: 0px 45px 0px 13px; line-height: 16.996px; min-height: 18px; white-space: nowrap; color: rgb(0, 0, 0); font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 14px; }
.S4 { border-left: 1px solid rgb(233, 233, 233); border-right: 1px solid rgb(233, 233, 233); border-top: 0px none rgb(0, 0, 0); border-bottom: 1px solid rgb(233, 233, 233); border-radius: 0px 0px 4px 4px; padding: 0px 45px 4px 13px; line-height: 16.996px; min-height: 18px; white-space: nowrap; color: rgb(0, 0, 0); font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 14px; }
.S2 { border-left: 1px solid rgb(233, 233, 233); border-right: 1px solid rgb(233, 233, 233); border-top: 1px solid rgb(233, 233, 233); border-bottom: 0px none rgb(0, 0, 0); border-radius: 4px 4px 0px 0px; padding: 6px 45px 0px 13px; line-height: 17.234px; min-height: 18px; white-space: nowrap; color: rgb(0, 0, 0); font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 14px; }
.S3 { border-left: 1px solid rgb(233, 233, 233); border-right: 1px solid rgb(233, 233, 233); border-top: 0px none rgb(0, 0, 0); border-bottom: 0px none rgb(0, 0, 0); border-radius: 0px; padding: 0px 45px 0px 13px; line-height: 17.234px; min-height: 18px; white-space: nowrap; color: rgb(0, 0, 0); font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 14px; }
.S4 { border-left: 1px solid rgb(233, 233, 233); border-right: 1px solid rgb(233, 233, 233); border-top: 0px none rgb(0, 0, 0); border-bottom: 1px solid rgb(233, 233, 233); border-radius: 0px 0px 4px 4px; padding: 0px 45px 4px 13px; line-height: 17.234px; min-height: 18px; white-space: nowrap; color: rgb(0, 0, 0); font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 14px; }
.S5 { margin: 10px 10px 9px 4px; padding: 0px; line-height: 21px; min-height: 0px; white-space: pre-wrap; color: rgb(0, 0, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 14px; font-weight: normal; text-align: left; }
.S6 { margin: 10px 0px 20px; padding-left: 0px; font-family: Helvetica, Arial, sans-serif; font-size: 14px; }
.S7 { margin-left: 56px; line-height: 21px; min-height: 0px; text-align: left; white-space: pre-wrap; }
Expand Down
2 changes: 1 addition & 1 deletion doc/adi_bsp.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2019b"><title>Analog Devices Inc. High Speed Converters Toolbox</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,IE=9,chrome=1"><meta name="generator" content="MATLAB R2020a"><title>Analog Devices Inc. High Speed Converters Toolbox</title><style type="text/css">.rtcContent { padding: 30px; } .S0 { margin: 3px 10px 5px 4px; padding: 0px; line-height: 28.8px; min-height: 0px; white-space: pre-wrap; color: rgb(213, 80, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 24px; font-weight: normal; text-align: left; }
.S1 { margin: 2px 10px 9px 4px; padding: 0px; line-height: 21px; min-height: 0px; white-space: pre-wrap; color: rgb(0, 0, 0); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 14px; font-weight: normal; text-align: left; }
.S2 { margin: 20px 10px 5px 4px; padding: 0px; line-height: 20px; min-height: 0px; white-space: pre-wrap; color: rgb(60, 60, 60); font-family: Helvetica, Arial, sans-serif; font-style: normal; font-size: 20px; font-weight: bold; text-align: left; }
.S3 { margin: 10px 0px 20px; padding-left: 0px; font-family: Helvetica, Arial, sans-serif; font-size: 14px; }
Expand Down
2 changes: 1 addition & 1 deletion hdl/vendor/AnalogDevices/Contents.m
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% High Speed Converter Toolbox: Analog Devices, Inc
% Version 19.1.1 (R2019a) 23-September-2019
% Version 20.1.1 (R2020a) 31-July-2020
2 changes: 1 addition & 1 deletion info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>R2019b</matlabrelease>
<matlabrelease>R2020a</matlabrelease>
<!-- (Required) Title of toolbox. Appears in the Contents pane -->
<name>Analog Devices, Inc. High Speed Converter Toolbox</name>
<!-- (Required) Label for the toolbox. pick one: -->
Expand Down

0 comments on commit 20cbc50

Please sign in to comment.