Skip to content

Commit

Permalink
WIP - v1.0 changes for AD9361, AD9361, Pluto
Browse files Browse the repository at this point in the history 
Signed-off-by: Pagadarai <Srikanth.Pagadarai@analog.com>
  • Loading branch information
@SrikanthPagadarai
SrikanthPagadarai committed Aug 13, 2024
1 parent 69ed4b7 commit a9c6918
Show file tree
Hide file tree
Showing 17 changed files with 1,318 additions and 127 deletions.
4 changes: 4 additions & 0 deletions +adi/+AD9361/Rx.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
%
% See also adi.FMComms2.Rx, adi.FMComms3.Rx, adi.FMComms5.Rx

properties
LibIIOVersion = '0.25';
end

properties
%CenterFrequency Center Frequency
% RF center frequency, specified in Hz as a scalar. The
Expand Down
59 changes: 59 additions & 0 deletions +adi/+AD9361v1/Base.asv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
classdef (Abstract, Hidden = true) Base < ...
adi.common.RxTx & ...
adi.common.Attribute & ...
adi.common.DebugAttribute & ...
matlabshared.libiio.base

%adi.AD9361.Base Class
% This class contains shared parameters and methods between TX and RX
% classes
properties (Nontunable)
%SamplesPerFrame Samples Per Frame
% Number of samples per frame, specified as an even positive
% integer from 2 to 16,777,216. Using values less than 3660 can
% yield poor performance.
SamplesPerFrame = 2^15;
end

properties (Nontunable, Logical)
%EnableCustomFilter Enable Custom Filter
% Enable use of custom filter file to set SamplingRate,
% RFBandwidth, and FIR in datapaths
EnableCustomFilter = false;
end

properties (Nontunable)
%CustomFilterFileName Custom Filter File Name
% Path to custom filter file created from filter wizard
CustomFilterFileName = '';
end

properties (Abstract)
%CenterFrequency Center Frequency
% RF center frequency, specified in Hz as a scalar. The
% default is 2.4e9. This property is tunable.
CenterFrequency
%SamplingRate Sampling Rate
% Baseband sampling rate in Hz, specified as a scalar
% from 65105 to 61.44e6 samples per second.
SamplingRate
%RFBandwidth RF Bandwidth
% RF Bandwidth of front-end analog filter in Hz, specified as a
% scalar from 200 kHz to 56 MHz.
RFBandwidth
end

properties(Nontunable, Hidden)
Timeout = Inf;
kernelBuffersCount = 2;
dataTypeStr = 'int16';
% phyDevName = 'ad9361-phy';
% iioDevPHY
end

properties (Hidden, Constant)
ComplexData = true;
end


end
161 changes: 161 additions & 0 deletions +adi/+AD9361v1/Base.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
classdef (Abstract, Hidden = true) Base < ...
adi.common.RxTx & ...
adi.common.Attribute & ...
adi.common.DebugAttribute & ...
matlabshared.libiio.base & ...
adi.libiio.base

%adi.AD9361.Base Class
% This class contains shared parameters and methods between TX and RX
% classes
properties (Nontunable)
%SamplesPerFrame Samples Per Frame
% Number of samples per frame, specified as an even positive
% integer from 2 to 16,777,216. Using values less than 3660 can
% yield poor performance.
SamplesPerFrame = 2^15;
end

properties (Nontunable, Logical)
%EnableCustomFilter Enable Custom Filter
% Enable use of custom filter file to set SamplingRate,
% RFBandwidth, and FIR in datapaths
EnableCustomFilter = false;
end

properties (Nontunable)
%CustomFilterFileName Custom Filter File Name
% Path to custom filter file created from filter wizard
CustomFilterFileName = '';
end

properties (Abstract)
%CenterFrequency Center Frequency
% RF center frequency, specified in Hz as a scalar. The
% default is 2.4e9. This property is tunable.
CenterFrequency
%SamplingRate Sampling Rate
% Baseband sampling rate in Hz, specified as a scalar
% from 65105 to 61.44e6 samples per second.
SamplingRate
%RFBandwidth RF Bandwidth
% RF Bandwidth of front-end analog filter in Hz, specified as a
% scalar from 200 kHz to 56 MHz.
RFBandwidth
end

properties(Nontunable, Hidden)
% Timeout = Inf;
kernelBuffersCount = 2;
dataTypeStr = 'int16';
phyDevName = 'ad9361-phy';
iioDevPHY
end

properties (Hidden, Constant)
ComplexData = true;
end

methods
% %% Constructor
function obj = Base(varargin)
% coder.allowpcode('plain');
% if strcmpi(obj.LibIIOVersion,'1.0')
% obj.libName = 'libiio1';
% obj = obj@adi.libiio.base(varargin{:});
% elseif strcmpi(obj.LibIIOVersion,'0.25')
% obj = obj@matlabshared.libiio.base(varargin{:});
% end
% obj = call_libiio_base(obj, varargin);
setProperties(obj,nargin,varargin{:});
end
% Destructor
function delete(obj)
teardownLibad9361(obj);
delete@adi.common.RxTx(obj);
end
% Check SamplesPerFrame
function set.SamplesPerFrame(obj, value)
validateattributes( value, { 'double','single' }, ...
{ 'real', 'positive','scalar', 'finite', 'nonnan', 'nonempty','integer','>',0,'<=',2^20}, ...
'', 'SamplesPerFrame');
obj.SamplesPerFrame = value;
end
% % Check EnableCustomFilter
% function set.EnableCustomFilter(obj, value)
% validateattributes( value, { 'logical' }, ...
% { }, ...
% '', 'EnableCustomFilter');
% obj.EnableCustomFilter = value;
% end
% % Check CustomFilterFileName
% function set.CustomFilterFileName(obj, value)
% validateattributes( value, { 'char' }, ...
% { }, ...
% '', 'CustomFilterFileName');
% obj.CustomFilterFileName = value;
% if obj.EnableCustomFilter && obj.ConnectedToDevice %#ok<MCSUP>
% writeFilterFile(obj);
% end
% end
end

%% API Functions
methods (Hidden, Access = protected)

function icon = getIconImpl(obj)
icon = sprintf(['AD9361 ',obj.Type]);
end

function setupLibad9361(obj)
libName = 'libad9361';
ad9361wrapperh = 'ad9361-wrapper.h';
ad9361h = 'ad9361.h';
fp = fileparts(which(ad9361h));
loadlibraryArgs = {ad9361wrapperh,'includepath',fp,'addheader',ad9361h};
if ~libisloaded(libName)
msgID = 'MATLAB:loadlibrary:StructTypeExists';
warnStruct = warning('off',msgID);
[~, ~] = loadlibrary(libName, loadlibraryArgs{:});
warning(warnStruct);
end
obj.iioDevPHY = calllib(obj.libName, 'iio_context_find_device',obj.iioCtx,'ad9361-phy');
end

function teardownLibad9361(~)
libName = 'libad9361';
if libisloaded(libName)
unloadlibrary(libName);
end
end

function writeFilterFile(obj)
fir_data_file = obj.CustomFilterFileName;
fir_data_str = fileread(fir_data_file);
obj.setAttributeRAW('voltage0','filter_fir_en','0',false);
obj.setAttributeRAW('voltage0','filter_fir_en','0',true);
obj.setDeviceAttributeRAW('filter_fir_config',fir_data_str);
obj.setAttributeRAW('voltage0','filter_fir_en','1',true);
obj.setAttributeRAW('voltage0','filter_fir_en','1',false);
end

end

%% External Dependency Methods
% methods (Hidden, Static)
%
% function tf = isSupportedContext(bldCfg)
% tf = matlabshared.libiio.ExternalDependency.isSupportedContext(bldCfg);
% end
%
% function updateBuildInfo(buildInfo, bldCfg)
% % Call the matlabshared.libiio.method first
% matlabshared.libiio.ExternalDependency.updateBuildInfo(buildInfo, bldCfg);
% end
%
% function bName = getDescriptiveName(~)
% bName = 'AD9361';
% end
%
% end
end
Loading

0 comments on commit a9c6918

Please sign in to comment.