Skip to content

Commit

Permalink
Merge pull request #4 from analogdevicesinc/r2019b-update
Browse files Browse the repository at this point in the history
R2019b update
  • Loading branch information
tfcollins authored Jan 16, 2020
2 parents ea8271e + 2fdbafd commit 303312a
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 25 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.1,1 (R2019a)
% Version 19.2.1 (R2019b)
%
% ==== Table of Contents (TOC) ====
%
Expand Down
6 changes: 3 additions & 3 deletions +adi/Version.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
% BSP Version information
properties(Constant)
HDL = 'hdl_2018_r2';
Vivado = '2012.8.1';
MATLAB = 'R2019a';
Release = '19.1.1';
Vivado = '2018.2';
MATLAB = 'R2019b';
Release = '19.2.1';
end
properties(Dependent)
VivadoShort
Expand Down
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ build:master:
- matlab
stage: build
script:
- export MLRELEASE=R2019a
- export MLRELEASE=R2019b
- export INCLUDE_EXAMPLES=1
- ./CI/scripts/dockermake build
- ./CI/scripts/dockermake gen_tlbx
Expand All @@ -49,7 +49,7 @@ build:master:
test_hdl:DAQ2:
extends: .hdl_tests
script:
- export MLRELEASE=R2019a
- export MLRELEASE=R2019b
- export BOARD=daq2
- ./CI/scripts/dockermake test

Expand All @@ -58,7 +58,7 @@ test_synth:Synthesize:
extends: .hdl_tests
stage: test_synth
script:
- export MLRELEASE=R2019a
- export MLRELEASE=R2019b
- export BOARD=daq2
- ./CI/scripts/dockermake test_synth

Expand Down Expand Up @@ -87,7 +87,7 @@ test_hardware:Streaming_Hardware:
dependencies:
- build:master
script:
- export MLRELEASE=R2019a
- export MLRELEASE=R2019b
- make -C CI/scripts test_streaming
artifacts:
when: always
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 := R2019a
MLRELEASE := R2019b
endif

ifeq ($(OS),Windows_NT)
Expand Down
2 changes: 1 addition & 1 deletion CI/scripts/bsp.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<param.company>Analog Devices, Inc</param.company>
<param.summary>Board support package for data streaming from Analog Devices high speed converters.</param.summary>
<param.description>Scripts and tools created by ADI to be used with MATLAB and Simulink with ADI high speed converters
Documentation: https://wiki.analog.com/resources/eval/user-guides/ad-fmcomms2-ebz/software/matlab_bsp
Documentation: https://wiki.analog.com/resources/tools-software/hsx-toolbox
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>
Expand Down
2 changes: 1 addition & 1 deletion CI/scripts/genTlbx.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function genTlbx(examples)
examples = 0;
end

version = '19.1.1';
version = '19.2.1';
ml = ver('MATLAB');
ml = ml.Release(2:end-1);

Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@ As with many open source packages, we use [GitHub](https://github.com/analogdevi

| HDL Branch | GitHub master status | MATLAB Release | Installer Package |
|:-----------------------:|:---------------------:|:-------:|:-------------------:|
| 2018_R2 | [![pipeline status](https://gitlab.com/tfcollins/HighSpeedConverterToolbox/badges/master/pipeline.svg)](https://gitlab.com/tfcollins/HighSpeedConverterToolbox/commits/master) | 2019a | <a href="https://gitlab.com/tfcollins/HighSpeedConverterToolbox/-/jobs/artifacts/master/download?job=deploy"><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 | [![pipeline status](https://gitlab.com/tfcollins/HighSpeedConverterToolbox/badges/master/pipeline.svg)](https://gitlab.com/tfcollins/HighSpeedConverterToolbox/commits/master) | 2019b | <a href="https://gitlab.com/tfcollins/HighSpeedConverterToolbox/-/jobs/artifacts/master/download?job=deploy"><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 and new features: MATLAB R2019a with Vivado 2018.2
- Bug fixes: MATLAB R2019a with Vivado 2018.2
- Bug fixes and new features: MATLAB R2019b with Vivado 2018.2

## Support and Documentation

All support questions should be posted in our [EngineerZone](https://ez.analog.com/linux-device-drivers/linux-software-drivers) forums. Documentation is included within the toolbox but additional documentation is avaible on the [ADI Wiki](https://wiki.analog.com/resources/eval/user-guides/matlab_bsp).
All support questions should be posted in our [EngineerZone](https://ez.analog.com/linux-device-drivers/linux-software-drivers) forums. Documentation is included within the toolbox but additional documentation is avaible on the [ADI Wiki](https://wiki.analog.com/resources/tools-software/hsx-toolbox).


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 R2019a"><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 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; }
.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 R2019a"><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 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; }
.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
2 changes: 1 addition & 1 deletion doc/SupportedHardware.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 R2019a"><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 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; }
.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; }
Expand Down
15 changes: 9 additions & 6 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 R2019a"><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 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; }
.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: 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; }
.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; }
.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 All @@ -21,6 +21,7 @@
receiveData = rx();
%%
%
tx = adi.<part_or_board_name>.Tx;
tx.uri = '<uri of board>';
tx(receiveData);
Expand Down Expand Up @@ -48,8 +49,10 @@
% * AD9144
% * AD9680
%%
% %
% %
%
%
%
%
%
##### SOURCE END #####
--></body></html>
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 R2019a"><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 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; }
.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 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>R2019a</matlabrelease>
<matlabrelease>R2019b</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 303312a

Please sign in to comment.