Skip to content

Add signal tests using m2k #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpineda3 wants to merge 9 commits into
base: main
Choose a base branch
from
+479 −16
Open

Add signal tests using m2k #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2766f9a
test: Control m2k source
jpineda3 Jun 13, 2024
e7dee8e
test: Add ad7768 signal test
jpineda3 Jun 13, 2024
ea25f17
test: Add ad4630-24 signal tests
jpineda3 Jun 13, 2024
d41ae93
test: Add ad4630-24 attribute tests
jpineda3 Jun 13, 2024
85decd9
test: Add ad7768-1 signal tests
jpineda3 Jun 13, 2024
03668a8
test: Add ad7768-1 attribute tests
jpineda3 Jun 13, 2024
c6f7f51
test: Fix test name typo
jpineda3 Oct 23, 2024
03f850f
test: Fix parameters
jpineda3 Feb 25, 2025
39a3f67
test: add libm2k path
jpineda3 Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions JenkinsfileHW
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ lock(label: 'adgt_test_harness_boards', quantity: 1){
// 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/PrecisionToolbox.git') // Not necessary when using checkout scm
harness.set_env('matlab_release','R2021b')
harness.set_env('matlab_release','R2023b')
harness.set_env('matlab_license','network')
harness.set_matlab_timeout('30m')

Expand All @@ -39,6 +39,7 @@ lock(label: 'adgt_test_harness_boards', quantity: 1){
harness.update_agents()

//Set other test parameters
harness.set_env('docker_image', 'tfcollins/test-harness-ci-ubuntu-22_04:latest')
harness.set_nebula_debug(true)
harness.set_enable_docker(true)
harness.set_docker_host_mode(true)
Expand All @@ -63,8 +64,10 @@ lock(label: 'adgt_test_harness_boards', quantity: 1){
harness.add_stage(rebootBoard,'continueWhenFail')

// Test stage
harness.set_matlab_commands(["addpath(genpath('test'))",
harness.set_matlab_commands(["addpath(genpath('/mlhsp/R2023b/toolbox/shared/libm2k'))",
"addpath(genpath('test'))",
"pyenv('Version','/usr/bin/python3')",
"disp(clib.libm2k.libm2k.context.getVersion())",
"runHWTests(getenv('board'))"])
harness.add_stage(harness.stage_library("MATLABTests"),'continueWhenFail')

Expand Down
135 changes: 130 additions & 5 deletions test/AD4630_24Tests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,154 @@
classdef AD4630_24Tests < HardwareTests

properties(TestParameter)
end
properties
uri = 'ip:analog-2.local';
author = 'ADI';
end


properties(TestParameter)
% start frequency, stop frequency, step, tolerance, repeats
signal_test = {{10000,250000,2500,0.05,10}};
signal_vpp = {0.5};
sample_rate = {'10000', '50000', '100000', ...
'200000', '500000', '1000000', ...
'1760000', '2000000'};
sample_averaging_length = { ...
'2', '4', '8', '16', '32', '64', '128', '256', ...
'512', '1024', '2048', '4096', '8192', '16384', ...
'32768', '65536'};
end

methods(TestClassSetup)
% Check hardware connected
function CheckForHardware(testCase)
Device = @()adi.AD4630_24.Rx('uri',testCase.uri);
testCase.CheckDevice('ip',Device,testCase.uri(4:end),false);
end
end

methods (Static)
function freq = estFrequencyMax(data,fs)
nSamp = length(data);
FFTRxData = fftshift(10*log10(abs(fft(data))));
df = fs/nSamp; freqRangeRx = (0:df:fs/2-df).';
% Disregard DC
[~,ind] = maxk(FFTRxData(end-length(freqRangeRx)+1:end,:),2);
freq = max(freqRangeRx(ind));
end
end

methods (Test)

function testAD4630_24Smoke(testCase)
adc = adi.AD4630_24.Rx('uri',testCase.uri);
data = adc();
[data,valid] = adc();
adc.release();
testCase.assertTrue(valid);
testCase.assertTrue(sum(abs(double(data)))>0);
end


function testAD4630_24DifferentialInputRMS(testCase,signal_vpp)
% Signal source setup
m2k_class = instr_m2k();
m2k = m2k_class.connect(getenv('M2K_URI'), false);
siggen = m2k_class.create_instr(m2k, "siggen");
% ADC setup
adc = adi.AD4630_24.Rx('uri',testCase.uri);
fs = str2double(adc.SampleRate);

% Set channel 1 to 50KHz, 500mHz and minimize channel 2 amplitude
signal_frequency = 5e4;
m2k_class.control(siggen, 0, [signal_frequency, signal_vpp, 0, 0]);
m2k_class.control(siggen, 1, [signal_frequency, 0.000001, 0, 0]);
for k = 1:5
[data,valid] = adc();
end
data = double(data);
% Generate same signal in channel 2 to double signal at differential inputs
m2k_class.control(siggen, 1, [signal_frequency, signal_vpp, 0, 0]);
for k = 1:5
[data1,valid1] = adc();
end
data1 = double(data1);

% Clean up
adc.release();
m2k_class.contextClose();

% Assertions
testCase.assertTrue(valid & valid1);
testCase.verifyEqual(rms(data1),rms(data)*2,'RelTol',0.3)
end

function testAD4630_24DifferentialInputSweep(testCase,signal_test)
% Signal source setup
m2k_class = instr_m2k();
m2k = m2k_class.connect(getenv('M2K_URI'), false);
siggen = m2k_class.create_instr(m2k, "siggen");
% ADC setup
adc = adi.AD4630_24.Rx('uri',testCase.uri);
adc.EnabledChannels = [1,2];
fs = str2double(adc.SampleRate);

start = signal_test{1};
stop = signal_test{2};
step = signal_test{3};
tol = signal_test{4};
repeats = signal_test{5};
numints = round((stop-start)/step);
for ii = 1:repeats
ind = randi([0, numints]);
frequency = start+(step*ind);
m2k_class.control(siggen, 0, [frequency, 0.5, 0, 0]);
m2k_class.control(siggen, 1, [frequency, 0.5, 0, 0]);
for k = 1:5
[data,valid] = adc();
end
data = double(data);
freq = testCase.estFrequencyMax(double(data),fs);

% Assertions
testCase.assertTrue(valid);
testCase.verifyEqual(freq(1),freq(2),'RelTol',tol)
testCase.verifyEqual(mean(freq),frequency,'RelTol',tol,...
'Frequency of signal unexpected')
end

% Clean up
adc.release();
m2k_class.contextClose();
end

function testAD4630_24AttrSampleRate(testCase,sample_rate)
% '1760000' is set as '1754386'
adc = adi.AD4630_24.Rx('uri',testCase.uri);
adc.uri = testCase.uri;
val = sample_rate;
adc.SampleRate = val;
[data,valid] = adc();
ret_val = adc.getDeviceAttributeRAW('sampling_frequency',9);
adc.release();
testCase.assertTrue(valid);
testCase.assertTrue(sum(abs(double(data)))>0);
% testCase.assertTrue(strcmp(val,string(ret_val)), ...
% 'Sample rate unexpected')
testCase.verifyEqual(str2double(ret_val),str2double(val), ...
'RelTol',0.01,'Sample rate unexpected')
end

% function testAD4630_24AttrSampleAveragingLength(testCase,sample_averaging_length)
% % The average mode works only with the output data mode set to 30-bit average
% % Skip test for now since it causes ERROR:READ LINE: -32 in iio_info
% adc = adi.AD4630_24.Rx('uri',testCase.uri);
% val = sample_averaging_length;
% adc.SampleAveragingLength = val;
% [data,valid] = adc();
% ret_val = adc.getDeviceAttributeRAW('sample_averaging',8);
% adc.release();
% testCase.assertTrue(valid);
% testCase.assertTrue(sum(abs(double(data)))>0);
% testCase.assertTrue(strcmp(val,string(ret_val)));
% end
end

end
Expand Down
55 changes: 52 additions & 3 deletions test/AD7768Tests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
classdef AD7768Tests < HardwareTests

properties(TestParameter)
end

properties
uri = 'ip:analog-2.local';
author = 'ADI';
end

properties(TestParameter)
% start frequency. stop frequency, step, tolerance, repeats
signal_test = {{1000,100000,2500,0.025,10}};
end

methods(TestClassSetup)
% Check hardware connected
Expand All @@ -14,6 +17,17 @@ function CheckForHardware(testCase)
testCase.CheckDevice('ip',Device,testCase.uri(4:end),false);
end
end

methods (Static)
function freq = estFrequencyMax(data,fs)
nSamp = length(data);
FFTRxData = fftshift(10*log10(abs(fft(data))));
df = fs/nSamp; freqRangeRx = (0:df:fs/2-df).';
% Disregard DC
[~,ind] = maxk(FFTRxData(end-length(freqRangeRx)+1:end,:),2);
freq = max(freqRangeRx(ind));
end
end

methods (Test)

Expand All @@ -24,6 +38,41 @@ function testAD7768Smoke(testCase)
adc.release();
testCase.assertTrue(sum(abs(double(data)))>0);
end

function testAD7768Signal(testCase,signal_test)
% Signal source setup
m2k_class = instr_m2k();
m2k = m2k_class.connect(getenv('M2K_URI'), false);
siggen = m2k_class.create_instr(m2k, "siggen");
% ADC setup
adc = adi.AD7768.Rx;
adc.uri = testCase.uri;
adc.EnabledChannels = [1 2 3 4 5 6 7 8];

start = signal_test{1};
stop = signal_test{2};
step = signal_test{3};
tol = signal_test{4};
repeats = signal_test{5};
numints = round((stop-start)/step);
for ii = 1:repeats
ind = randi([0, numints]);
frequency = start+(step*ind);
m2k_class.control(siggen, 0, [frequency, 0.5, 0.5, 0]);
m2k_class.control(siggen, 1, [frequency, 0.5, 0.5, 0]);
for k = 1:5
data = adc();
end
for ch = adc.EnabledChannels
freqEst = testCase.estFrequencyMax(data(:,ch),str2double(adc.SampleRate));
testCase.assertTrue(sum(abs(double(data(:,ch))))>0);
testCase.verifyEqual(freqEst,frequency,'RelTol',tol,...
'Frequency of signal unexpected')
end
end
adc.release();
m2k_class.contextClose();
end

end

Expand Down
Loading