edited devName<0,1,2,3> in properties in Tx.m. Added DSAChip<A,B,C,D>, HPF, and LPF to properties and removed ExternalAttenuation from properties in Rx.m. Added methods set.DSAChip<A,B,C,D> in Rx.m. Updated devName<0,1,2,3> in properties in Rx.m

Author: jchambliss

+adi/+QuadAD9084/Rx.m

@@ -163,7 +163,12 @@
     properties
         %ExternalAttenuation External Attenuation
         %   Attenuation value of external HMC425a
-       ExternalAttenuation = 0; 
+       DSAChipA = 0;
+       DSAChipB = 0;
+       DSAChipC = 0;
+       DSAChipD = 0;
+       HPF = 0;
+       LPF = 0;
     end
 
     properties(Logical, Nontunable)
@@ -205,10 +210,10 @@
         num_coarse_attr_channels = 4;
         num_fine_attr_channels = 4;
         devName = 'axi-ad9084-rx-hpc';
-        devName0 = 'iio:device11';
-        devName1 = 'iio:device12';
-        devName2 = 'iio:device13';
-        devName3 = '';
+        devName0 = '';
+        devName1 = 'iio:device13';
+        devName2 = 'iio:device16';
+        devName3 = 'iio:device19';
     end
 
     properties (Hidden)
@@ -217,6 +222,12 @@
        iioDev2;
        iioDev3;
        iioHMC425a;
+       iioDev23;
+       iioDev24;
+       iioDev25;
+       iioDev26;
+       iioDev10;
+       iioDev11;
     end
 
     methods
@@ -432,21 +443,85 @@
 %             end
 %         end
 
-        %%
-        % Check ExternalAttenuation
-        function set.ExternalAttenuation(obj, value)
-%             validateattributes( value, { 'double','single' }, ...
-%                 { 'real', 'scalar', 'finite', 'nonnan', 'nonempty', '>=', -4,'<=', 71}, ...
-%                 '', 'Gain');
-%             assert(mod(value,1/4)==0, 'Gain must be a multiple of 0.25');
-            obj.ExternalAttenuation = value;
-            if obj.ConnectedToDevice
-                id = 'voltage0';
-                obj.setAttributeLongLong(id,'hardwaregain',value,true,0,obj.iioHMC425a);
-            end
+
+%   Check ExternalAttenuation
+
+    function set.DSAChipA(obj, value)
+        if all(and(value>0, value<-31.5))
+            fprintf('DSA set value out of range. Must be between -31.5 and 0 \n')
+            return
+        end
+           obj.DSAChipA = value;
+           if obj.ConnectedToDevice
+               id = 'voltage0';
+                 obj.setAttributeLongLong(id,'hardwaregain',value,true,0,obj.iioDev23);
+           end
+    end
+
+    function set.DSAChipB(obj,value)
+        if all(and(value>0, value<-31.5))
+            fprintf('DSA set value out of range. Must be between -31.5 and 0 \n')
+            return
+        end
+        obj.DSAChipB = value;
+        if obj.ConnectedToDevice
+            id = 'voltage0';
+            obj.setAttributeLongLong(id,'hardwaregain',value,true,0,obj.iioDev24);
+        end
+    end
+
+    function set.DSAChipC(obj,value)
+        if all(and(value>0, value<-31.5))
+            fprintf('DSA set value out of range. Must be between -31.5 and 0 \n')
+            return
+        end
+        obj.DSAChipC = value;
+        if obj.ConnectedToDevice
+            id = 'voltage0';
+            obj.setAttributeLongLong(id, 'hardwaregain',value,true,0,obj.iioDev25);
+        end
+    end
+
+    function set.DSAChipD(obj,value)
+        if all(and(value>0, value<-31.5))
+            fprintf('DSA set value out of range. Must be between -31.5 and 0 \n')
+            return
         end
+        obj.DSAChipD = value;
+        if obj.ConnectedToDevice
+            id = 'voltage0';
+            obj.setAttributeLongLong(id,'hardwaregain',value,true,0,obj.iioDev26);
+        end
+    end
+
+    function set.HPF(obj,value)
+        if(value > 15 || value < 0 || floor(value) ~= value)
+            fprintf('Filter state must be an integer between 0 and 15\n')
+            return
+        end
+        obj.HPF = value;
+        if obj.ConnectedToDevice
+            obj.setDeviceAttributeLongLong('mux_select', value, obj.iioDev11);
+        end
+        
     end
+
+    function set.LPF(obj,value)
+        if(value > 15 || value < 0 || floor(value) ~= value)
+            fprintf('Filter state must be an integer between 0 and 15\n')
+            return
+        end
+        obj.LPF = value;
+        if obj.ConnectedToDevice
+            obj.setDeviceAttributeLongLong('mux_select', value, obj.iioDev10);
+        end
+    end
+
+    end
+
+
 
+    
     %% API Functions
     methods (Hidden, Access = protected)
 
@@ -484,22 +559,29 @@ function setupInit(obj)
 
 %             xmlData = calllib(obj.libName, 'iio_context_get_xml', obj.iioCtx);
 
-            % Get additional devices
-            obj.iioDev0 = getDev(obj, obj.devName0);
+            % Get additional device
             obj.iioDev1 = getDev(obj, obj.devName1);
             obj.iioDev2 = getDev(obj, obj.devName2);
-            if ~strcmpi(obj.devName3,'')
-                obj.iioDev3 = getDev(obj, obj.devName3);
+            obj.iioDev3 = getDev(obj, obj.devName3);
+            if ~strcmpi(obj.devName0,'')
+                obj.iioDev0 = getDev(obj, obj.devName0);
             else
-                obj.iioDev3 = getDev(obj, obj.devName);
+                obj.iioDev0 = getDev(obj, obj.devName);
             end
 
             % Rev C uses a different DSA
-            obj.iioHMC425a = getDev(obj, 'hmc425a');
+            %obj.iioHMC425a = getDev(obj, 'hmc425a');
+            obj.iioDev23 = getDev(obj, 'iio:device22');
+            obj.iioDev24 = getDev(obj, 'iio:device23');
+            obj.iioDev25 = getDev(obj, 'iio:device24');
+            obj.iioDev26 = getDev(obj, 'iio:device25');
+            obj.iioDev10 = getDev(obj, 'iio:device9');
+            obj.iioDev11 = getDev(obj, 'iio:device10');
 %             obj.iioHMC425a = iio_context_find_device(obj, obj.iioCtx, 'hmc425a');
-%             status = cPtrCheck(obj,obj.iioHMC425a);
+%           obj.iioDev22 = iio_context_find_device(obj, obj.iioCtx, 'dsa0');
+%             status = cPtrCheck(obj,obj.iioDev22);
 %             if status < 0
-%                 obj.iioHMC425a = getDev(obj, 'hmc540s');
+%                 obj.iioDev22 = getDev(obj, 'iio:device22');
 %             end
 
             if obj.CalibrationBoardAttached
@@ -593,11 +675,11 @@ function setupInit(obj)
 %                 obj.writeFilterFile(obj.iioDev3,obj.PFIRFilenamesChipD);
 %             end
             %%
-            obj.setAttributeLongLong('voltage0','hardwaregain',...
-                obj.ExternalAttenuation,true,0,obj.iioHMC425a);
+%             obj.setAttributeLongLong('voltage0','hardwaregain',...
+%                 obj.ExternalAttenuation,true,0,obj.iioHMC425a);
 
         end
 
     end
 
-end
+end

+adi/+QuadAD9084/Tx.m

@@ -172,15 +172,15 @@
 
     properties (Nontunable, Hidden)
         channel_names;
-        num_data_channels = 32;
+        num_data_channels = 16;
         num_coarse_attr_channels = 4;
-        num_fine_attr_channels = 8;
+        num_fine_attr_channels = 4;
         num_dds_channels = 128;
         devName = 'axi-ad9084-tx-hpc';
-        devName0 = 'iio:device11';
-        devName1 = 'iio:device12';
-        devName2 = 'iio:device13';
-        devName3 = 'iio:device18';
+        devName0 = 'axi-ad9084-rx-hpc';
+        devName1 = 'axi-ad9084-rx1';
+        devName2 = 'axi-ad9084-rx2';
+        devName3 = 'axi-ad9084-rx3';
     end
 
     properties (Hidden)