diff --git a/App/app.mlapp b/App/app.mlapp index 85352a0..e669fa6 100644 Binary files a/App/app.mlapp and b/App/app.mlapp differ diff --git a/src/Select/SoundGeneratorSelect.m b/src/Select/SoundGeneratorSelect.m index 3fe715a..94aed21 100644 --- a/src/Select/SoundGeneratorSelect.m +++ b/src/Select/SoundGeneratorSelect.m @@ -1,26 +1,26 @@ -%Written by Darell +%Written by Darell, edited by Arthur Lu % CONTRIBUTORS: % Person1: Darell +% Person2: Arthur Lu % DOCUMENTATION: %Pass-through function used by app function output = SoundGeneratorSelect(amplitude, frequency, phase, fs, duration, duty,number) - if(number == "Option 1") + if(number == "Sine") output = generate_sine(amplitude, frequency, phase, fs, duration, duty); - elseif(number == "Option 2") + elseif(number == "Square") output = generate_square(amplitude, frequency, phase, fs, duration, duty); - elseif(number == "Option 3") + elseif(number == "Triangle") output = generate_triangle(amplitude, frequency, phase, fs, duration, duty); - elseif(number == "Option 4") + elseif(number == "Sawtooth") output = generate_sawtooth(amplitude, frequency, phase, fs, duration, duty); - elseif(number == "Option 5") + elseif(number == "WhiteNoise") output = generate_white(amplitude, fs, duration); - elseif(number == "Option 6") + elseif(number == "HalfCircles") output = generate_halfCircles(amplitude, frequency, phase, fs, duration, duty); else output = 0; end -end - +end \ No newline at end of file