Merge branch 'main' of https://github.com/ltcptgeneral/ece45-project

src/Helper/fade_in.m

@@ -12,10 +12,21 @@ function output = fade_in(input, time)
     
     len = length(input);
     
+    % need to use whole number for time
+    time = round(time);
+    
     % if time parameter longer than signal, treat time as
     % the duration of original signal
     if time > len
-        time = len
+        time = len;
+    end
+    
+    % in order to create array, time >=1
+    % if not, it's arbitrarily set to 1
+    % in which case the fade_in effect
+    % is virtually nonexistent
+    if time < 1
+        time = 1;
     end
 
     % set multiplier as 1D array

src/Helper/fade_out.m

@@ -11,18 +11,29 @@ function output = fade_out(input, time)
     
     len = length(input);
     
+    % need to use time as a whole number
+    time = round(time);
+    
     % if time parameter longer than signal, treat time as
     % the duration of original signal
     if time > len
         time = len
     end
 
+    % in order to create array, time >=1
+    % if not, it's arbitrarily set to 1
+    % in which case the fade_in effect
+    % is virtually nonexistent
+    if time < 1
+        time = 1;
+    end
+    
     % set multiplier as 1D array
 
     multiplier = (1 : time) / time;
 
     % fade out effect: from full volume of signal to no volume
-    multiplier = flip(multiplier)
+    multiplier = flip(multiplier);
     
     while length(multiplier) < len
         multiplier = [multiplier 0];

src/generate_trapezoid.m

@@ -0,0 +1,55 @@
+function x = generate_trapezoid(amplitude, frequency, phase, fs, duration, duty)
+% GENERATE_TRAPEZOID: returns a matrix of sampled square wave
+
+% CONTRIBUTORS:
+% Daniel Doan: Author
+
+% DOCUMENTATION:
+% phase shift is in number of periods
+% fs is the sampling frequency: how many sample points per second
+% duration is time in seconds
+% duty cycle should be a number between 0 and 1.
+    % duty of 0.5 would have 2 trapezoids in first half of each cycle
+    % example of wave with duty of 0.5, where the peaks are amplitude/2: 
+    % 
+    %   ____ 
+    %  /    \
+    % /      \        ________________
+    %         \      /
+    %          \____/
+    % 
+
+
+
+% initialize local variables from input arguments
+    n = fs * duration; % number of samples (length of matrix)
+    dt = 1 / fs; % sampling period: time between two sample points
+    
+    % initialize a one dimensional zero matrix to be populated
+    x = zeros(1, n);
+    
+    % populate the matrix
+    for i = 1:n
+        t = i * dt;
+        
+        % periodic ramp from 0 to 1
+        % progression through a cycle
+        st = mod(frequency * t - phase, 1);
+        slope = (amplitude/2) / (duty/8);
+        if(st < duty)
+            if(st < duty/8 || st > 7*duty/8)
+                x(i) = slope * st;
+            else
+                if(st < 5*duty/8)
+                    x(i) = amplitude/2 - slope * (st-(3*duty/8));
+                end
+                if(st < 3*duty/8)
+                    x(i) = amplitude/2;
+                end
+                if(st > 5*duty/8)
+                    x(i) = -amplitude/2;
+                end
+            end
+        end
+    end
+end