Skip to content

Commit

Permalink
Merge pull request #34 from analogdevicesinc/v22_1_1
Browse files Browse the repository at this point in the history 
V22 1 1
  • Loading branch information
@tfcollins
tfcollins authored Sep 25, 2023
2 parents cb14cc8 + 2cb5301 commit e0d6c12
Show file tree
Hide file tree
Showing 18 changed files with 449 additions and 360 deletions.
6 changes: 6 additions & 0 deletions +adi/+internal/ADAR100x.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -968,10 +968,16 @@ function Initialize(obj, PAOff, PAOn, LNAOff, LNAOn)

methods
function LatchRxSettings(obj)
if ~obj.ConnectedToDevice
error('LatchRxSettings() needs to be called after establishing connection to hardware!\n');
end
setAllChipsDeviceAttributeRAW(obj, 'rx_load_spi', (true(size(obj.SubarrayToChipMap))), true);
end

function LatchTxSettings(obj)
if ~obj.ConnectedToDevice
error('LatchTxSettings() needs to be called after establishing connection to hardware!\n');
end
setAllChipsDeviceAttributeRAW(obj, 'tx_load_spi', (true(size(obj.SubarrayToChipMap))), true);
end
end
Expand Down
52 changes: 22 additions & 30 deletions +adi/+internal/ADF4371.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%ADF4371Name ADF4371 Name
% Configure programmable divider for ADF4371
% Options: 'RF16x' or 'RF32x'
ADF4371Name = 'RF16x'
ADF4371Name (1,1) string {mustBeMember(ADF4371Name, ["RF16x", "RF32x"])} = "RF16x";
%ADF4371Frequency ADF4371 Frequency
% Configure ADF4371 output frequency
% Allowed range:
Expand Down Expand Up @@ -46,52 +46,52 @@

methods
function set.ADF4371Name(obj, value)
obj.ADF4371Name = value;
if obj.ConnectedToDevice
switch value
% inverted logic to enable the correct channel
case 'RF16x'
setAttributeBool(obj,'altvoltage0','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage1','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage2','powerdown',false,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage3','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage0','powerdown',true,true,obj.ADF4371Device,false);
setAttributeBool(obj,'altvoltage1','powerdown',true,true,obj.ADF4371Device,false);
setAttributeBool(obj,'altvoltage2','powerdown',false,true,obj.ADF4371Device,false);
setAttributeBool(obj,'altvoltage3','powerdown',true,true,obj.ADF4371Device,false);
obj.ADF4371Channel = 'altvoltage2';
case 'RF32x'
setAttributeBool(obj,'altvoltage0','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage1','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage2','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage3','powerdown',false,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage0','powerdown',true,true,obj.ADF4371Device,false);
setAttributeBool(obj,'altvoltage1','powerdown',true,true,obj.ADF4371Device,false);
setAttributeBool(obj,'altvoltage2','powerdown',true,true,obj.ADF4371Device,false);
setAttributeBool(obj,'altvoltage3','powerdown',false,true,obj.ADF4371Device,false);
obj.ADF4371Channel = 'altvoltage3';
otherwise
error('Invalid setting chosen for ADF4371Name');
end
end
obj.ADF4371Name = value;
end

function set.ADF4371Frequency(obj, value)
switch obj.ADF4371Name
case 'RF16x'
validateattributes( obj.ADF4371Frequency,{ 'double','single', 'uint32' }, ...
{ 'real', 'nonnegative','scalar','finite','nonnan', 'nonempty','integer',...
validateattributes( value,{ 'double','single', 'uint64' }, ...
{ 'real', 'nonnegative','scalar','finite','nonnan', 'nonempty',...
'>=',8000000000,'<=',16000000000},'', 'ADF4371Frequency');
case 'RF32x'
validateattributes( obj.ADF4371Frequency,{ 'double','single', 'uint32' }, ...
{ 'real', 'nonnegative','scalar','finite','nonnan', 'nonempty','integer',...
validateattributes( value,{ 'double','single', 'uint64' }, ...
{ 'real', 'nonnegative','scalar','finite','nonnan', 'nonempty',...
'>=',16000000000,'<=',32000000000},'', 'ADF4371Frequency');
end
obj.ADF4371Frequency = value;
if obj.ConnectedToDevice
setAttributeLongLong(obj,obj.ADF4371Channel,'frequency',value,true,0,obj.ADF4371Device);
setAttributeLongLong(obj,obj.ADF4371Channel,'frequency',value,true,0,obj.ADF4371Device,false);
end
end

function set.ADF4371Phase(obj, value)
validateattributes( obj.ADF4371Phase, { 'double','single', 'uint32' }, ...
validateattributes( value, { 'double','single', 'uint32' }, ...
{ 'real', 'nonnegative','scalar', 'finite', 'nonnan', 'nonempty','integer','>=',0,'<=',359999}, ...
'', 'ADF4371Phase');
obj.ADF4371Phase = value;
if obj.ConnectedToDevice
setAttributeLongLong(obj,obj.ADF4371Channel,'phase',value,true,1,obj.ADF4371Device);
setAttributeLongLong(obj,obj.ADF4371Channel,'phase',value,true,1,obj.ADF4371Device,false);
end
end

Expand All @@ -111,15 +111,7 @@

methods (Hidden, Access = protected)
function setupInit(obj)
numDevs = obj.iio_context_get_devices_count(obj.iioCtx);
obj.ADF4371Device = cell(1,length(obj.ADF4371DeviceName));
for k = 1:numDevs
devPtr = obj.iio_context_get_device(obj.iioCtx, k-1);
name = obj.iio_device_get_name(devPtr);
if strcmpi(obj.ADF4371DeviceName,name)
obj.ADF4371Device = devPtr;
end
end
obj.ADF4371Device = obj.getDev(obj.ADF4371DeviceName);
if isempty(obj.ADF4371Device)
error('%s not found',obj.ADF4371DeviceName);
end
Expand All @@ -134,10 +126,10 @@ function setupInit(obj)
otherwise
error('Invalid setting chosen for ADF4371Name');
end
setAttributeBool(obj,'altvoltage0','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage1','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage2','powerdown',false,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage3','powerdown',true,true,obj.ADF4371Device);
setAttributeBool(obj,'altvoltage0','powerdown',true,true,obj.ADF4371Device, false);
setAttributeBool(obj,'altvoltage1','powerdown',true,true,obj.ADF4371Device, false);
setAttributeBool(obj,'altvoltage2','powerdown',false,true,obj.ADF4371Device, false);
setAttributeBool(obj,'altvoltage3','powerdown',true,true,obj.ADF4371Device, false);
obj.setAttributeLongLong(obj.ADF4371Channel,'frequency',obj.ADF4371Frequency,true,0,obj.ADF4371Device);
obj.setAttributeLongLong(obj.ADF4371Channel,'phase',obj.ADF4371Phase,true,1,obj.ADF4371Device);
obj.setDeviceAttributeRAW('muxout_enable', num2str(obj.MUXOutEnable), obj.ADF4371Device);
Expand Down
Loading

0 comments on commit e0d6c12

Please sign in to comment.