Merge pull request #159 from analogdevicesinc/tfcollins/ad9361-srs

Update AD9361 Sample rate prop
analogdevicesinc · Oct 25, 2023 · df13b04 · df13b04
2 parents 8ac4c5d + 5952cc3
commit df13b04
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 44 deletions.
diff --git a/+adi/+AD9361/Rx.m b/+adi/+AD9361/Rx.m
@@ -253,12 +253,14 @@
 
             obj.SamplingRate = value;
             if obj.ConnectedToDevice && ~obj.EnableCustomFilter
+                id = 'voltage0';
+                p = 'sampling_frequency';
                 if libisloaded('libad9361')
                     calllib('libad9361','ad9361_set_bb_rate',obj.iioDevPHY,int32(value));
                 else
-                    id = 'voltage0';
-                    obj.setAttributeLongLong(id,'sampling_frequency',value,true,4);
+                    obj.setAttributeLongLong(id,p,value,true,4);
                 end
+                obj.SamplingRate = double(obj.getAttributeLongLong(id,p,true));
             end
         end  
         function set.LoopbackMode(obj, value)

diff --git a/+adi/+AD9361/Tx.m b/+adi/+AD9361/Tx.m
@@ -149,12 +149,14 @@
             end
             obj.SamplingRate = value;
             if obj.ConnectedToDevice && ~obj.EnableCustomFilter
+                id = 'voltage0';
+                p = 'sampling_frequency';
                 if libisloaded('libad9361')
                     calllib('libad9361','ad9361_set_bb_rate',obj.iioDevPHY,int32(value));
                 else
-                    id = 'voltage0';
-                    obj.setAttributeLongLong(id,'sampling_frequency',value,true,4);
+                    obj.setAttributeLongLong(id,p,value,true,4);
                 end
+                obj.SamplingRate = double(obj.getAttributeLongLong(id,p,true));
             end
         end
     end

diff --git a/CI/scripts/genTlbx.m b/CI/scripts/genTlbx.m
@@ -12,16 +12,6 @@ function genTlbx(examples)
 v = adi.Version;
 uuid = matlab.lang.internal.uuid;
 
-%% Unpack verilog source
-if ~examples
-    cd('../../');
-    cd('hdl/vendor/AnalogDevices/vivado');
-    !find -name '*.zip' -exec sh -c 'unzip -d "${1%.*}" "$1"' _ {} \;
-    !find . -name "*.zip" -type f -delete
-    cd('../../../..');
-    cd('CI/scripts');
-end
-
 %%
 cd(fileparts((mfilename('fullpath'))));
 cd('../..');
@@ -60,6 +50,13 @@ function genTlbx(examples)
     ps = [ps(:)',{'hdl'}];
 end
 
+% Check for deps
+if ~isfolder('deps')
+    error('deps folder with libad9361 not available')
+else
+    ps = [ps(:)',{'deps'}];
+end
+
 paths = '';
 for p = ps
     pp = genpath(p{:});
@@ -79,36 +76,6 @@ function genTlbx(examples)
 end
 matlab.addons.toolbox.packageToolbox(projectFile,outputFile)
 
-if ~usejava('desktop')
-    %% Update toolbox paths
-    mkdir other
-    movefile([outputFile,'.mltbx'], ['other/',outputFile,'.zip']);
-    cd other
-    unzip([outputFile,'.zip'],'out');
-    cd('out')
-    cd('metadata');
-    fid  = fopen('configuration.xml','r');
-    f=fread(fid,'*char')';
-    fclose(fid);
-
-    s = '</matlabPaths>';
-    sections = strsplit(f,s);
-    s1 = sections{1};
-    s2 = sections{2};
-    newfile = [s1,paths,s,s2];
-
-    fid  = fopen('configuration.xml','w');
-    fprintf(fid,'%s',newfile);
-    fclose(fid);
-
-    %% Repack
-    cd('..');
-    zip([outputFile,'.zip'], '*');
-    movefile([outputFile,'.zip'],['../../',outputFile,'.mltbx']);
-    cd('../..');
-    rmdir('other','s');
-end
-
 delete bsp.prj