changes from friday

Classes/Scope.m

@@ -93,7 +93,8 @@ classdef Scope
             % sample signal
             % TODO: implement and test the delays. Also look for delay of
             % lpf filter
-            yout = obj.sampleSignal(xin);
+            %yout = obj.sampleSignal(xin);
+            yout = resample(xin,obj.fadc,obj.fsimu);
 
             % quantize signal
             yout = obj.quantize(yout);
@@ -148,6 +149,8 @@ classdef Scope
             % Sample the signal using linear interpolation
             sampout = xin(floor(inx_re)) .* (1 - val_re) + xin(ceil(inx_re)) .* val_re ;
 
+            sampout2 = resample(xin,obj.fadc,obj.fsimu);
+
         end
 
         function quantout = quantize(obj,xin)