Initial updates for R2019a

Signed-off-by: Travis Collins <[email protected]>

Author: tfcollins

+adi/+common/DDS.m

@@ -51,7 +51,7 @@
     methods (Hidden, Access=protected)
 
         function ToggleDDS(obj,value)
-            chanPtr = getChan(obj,'altvoltage0',true);
+            chanPtr = getChan(obj,obj.iioDev,'altvoltage0',true);
             iio_channel_attr_write_bool(obj,chanPtr,'raw',value);
         end
 
@@ -60,7 +60,7 @@ function DDSUpdate(obj)
             for g=1:obj.channelCount/2
                 for k=1:4
                     id = sprintf('altvoltage%d',k-1);
-                    chanPtr = getChan(obj,id,true);
+                    chanPtr = getChan(obj,obj.iioDev,id,true);
                     iio_channel_attr_write_double(obj,chanPtr,'frequency',obj.DDSFrequencies(g,k));
                     iio_channel_attr_write_double(obj,chanPtr,'scale',obj.DDSScales(g,k));
                     iio_channel_attr_write_double(obj,chanPtr,'phase',obj.DDSPhases(g,k));

+adi/+common/RxTx.m

@@ -84,7 +84,7 @@ function releaseChanBuffers(obj)
             % Disable the channels
             if obj.enabledChannels
                 for k=1:obj.channelCount
-                    disableChannel(obj, obj.channel_names{k}, obj.isOutput);
+                    disableChannel(obj, obj.iioDev, obj.channel_names{k}, obj.isOutput);
                 end
                 obj.enabledChannels = false;
             end
@@ -101,7 +101,7 @@ function releaseChanBuffers(obj)
 
             % Enable the channel(s)
             for k=1:obj.channelCount
-                enableChannel(obj, obj.channel_names{k}, obj.isOutput);
+                enableChannel(obj, obj.iioDev, obj.channel_names{k}, obj.isOutput);
             end
             obj.enabledChannels = true;
 

.gitlab-ci.yml

@@ -11,6 +11,7 @@ build:2018_R1:
      - matlab
     stage: build
     script:
+     - export MLRELEASE=R2019a
      - ./CI/scripts/dockermake build
      - ./CI/scripts/dockermake add_libad9361
      - ./CI/scripts/dockermake gen_tlbx
@@ -31,7 +32,7 @@ build:master:
     stage: build
     script:
      - export HDLBRANCH=hdl_2018_r2
-     - export MLRELEASE=R2018b
+     - export MLRELEASE=R2019a
      - ./CI/scripts/dockermake build
      - export HDLBRANCH=
      - export MLRELEASE=
@@ -49,6 +50,7 @@ test:2018_R1:
     dependencies:
      - build:2018_R1
     script:
+     - export MLRELEASE=R2019a
      - ./CI/scripts/dockermake test
      - ./CI/scripts/dockermake zip
     artifacts:
@@ -68,6 +70,7 @@ test_installer:2018_R1_Installer:
     dependencies:
      - build:2018_R1
     script:
+     - export MLRELEASE=R2019a
      - cp mltbx/* .
      - pwd
      - ls
@@ -91,6 +94,7 @@ test:2018_R1:
     dependencies:
      - build:2018_R1
     script:
+     - export MLRELEASE=R2019a
      - ./CI/scripts/dockermake test
      - ./CI/scripts/dockermake zip
     artifacts:
@@ -110,6 +114,7 @@ test:targeting_demos:
     dependencies:
      - build:2018_R1
     script:
+     - export MLRELEASE=R2019a
      - ./CI/scripts/dockermake test_targeting_demos
     artifacts:
         when: always
@@ -127,6 +132,7 @@ test_hardware:Streaming_Hardware:
     dependencies:
      - build:2018_R1
     script:
+     - export MLRELEASE=R2019a
      - cd CI/scripts
      - make test_streaming
     artifacts:
@@ -145,6 +151,7 @@ test_hardware:EVM_Hardware:
     dependencies:
      - build:2018_R1
     script:
+     - export MLRELEASE=R2019a
      - cd CI/scripts
      - make test_evm
     artifacts:

CI/scripts/bsp.tmpl

@@ -60,8 +60,8 @@ mltbx/*
     <param.matlabpath.excludes />
     <param.javaclasspath.excludes />
     <param.exported.on.package>false</param.exported.on.package>
-    <param.release.start>R2018b</param.release.start>
-    <param.release.end>R2018b</param.release.end>
+    <param.release.start>__ML-RELEASE__</param.release.start>
+    <param.release.end>__ML-RELEASE__</param.release.end>
     <param.release.current.only>true</param.release.current.only>
     <param.compatiblity.windows>true</param.compatiblity.windows>
     <param.compatiblity.macos>false</param.compatiblity.macos>
@@ -116,7 +116,7 @@ mltbx/*
     </build-deliverables>
     <workflow />
     <matlab>
-      <root>/usr/local/MATLAB/R2018b</root>
+      <root>/usr/local/MATLAB/__ML-RELEASE__</root>
       <toolboxes>
         <toolbox name="matlabcoder" />
         <toolbox name="embeddedcoder" />

CI/scripts/genTlbx.m

@@ -1,5 +1,7 @@
 
-version = '18.2.1';
+version = '19.1';
+ml = ver('MATLAB');
+ml = ml.Release(2:end-1);
 
 %%
 cd(fileparts((mfilename('fullpath'))));
@@ -13,6 +15,7 @@
 
 f = strrep(f,'__REPO-ROOT__',p);
 f = strrep(f,'__VERSION__',version);
+f = strrep(f,'__ML-RELEASE__',ml);
 
 fid  = fopen('../../bsp.prj','w');
 fprintf(fid,'%s',f);