Lab changes

Classes/05_Lab/AwgKeysight.m

@@ -24,9 +24,9 @@ classdef AwgKeysight
 
     properties(Access=protected)
         model awg_model
-        fdac double
+        %fdac double
         skews double
-        voltages double
+        %voltages double
         scaletodac logical
 
         numChannels double
@@ -36,6 +36,11 @@ classdef AwgKeysight
         numProvidedSignals double
     end
 
+    properties(Access=public)
+        fdac double
+        voltages double
+    end
+    
     methods (Access=public)
 
         function obj = AwgKeysight(options)
@@ -78,7 +83,7 @@ classdef AwgKeysight
 
         end
 
-        function upload(obj,channels,options)
+        function [signal1,signal2,signal3,signal4] = upload(obj,channels,options)
 
             arguments
                 obj
@@ -116,7 +121,18 @@ classdef AwgKeysight
 
             success = obj.upload_(unpackedSignals);
 
+            for s = 1:obj.numChannels
+                lbdesc = ['Upload to Awg'];
+                obj  = channels.(fn{s}).logbookentry(lbdesc,obj);
+            end
+
+            signal1 = channels.signal1;
+            signal2 = channels.signal2;
+            signal3 = channels.signal3;
+            signal4 = channels.signal4;
+
         end
+    
     end
 
 
@@ -203,8 +219,11 @@ classdef AwgKeysight
                     v = visadev('TCPIP0::localhost::hislip0::INSTR');
             end
 
-            disp(['Connected to Instrument: ',char(v.Vendor),' ',char(v.Model),' SerNo:',char(v.SerialNumber)]);
-
+            debug = 0;
+            if debug 
+                disp(['Connected to Instrument: ',char(v.Vendor),' ',char(v.Model),' SerNo:',char(v.SerialNumber)]);
+            end
+            
             %check if channel config matches
             writeline(v,'*opt?');
             aw=readline(v);