diff --git a/app.mlapp b/app.mlapp index 9038b4a..565f743 100644 Binary files a/app.mlapp and b/app.mlapp differ diff --git a/src/NotWorking/generate_keyboard.m b/src/Instruments/generate_keyboard.m similarity index 100% rename from src/NotWorking/generate_keyboard.m rename to src/Instruments/generate_keyboard.m diff --git a/src/NotWorking/lfo_square.m b/src/LFO/lfo_square.m similarity index 100% rename from src/NotWorking/lfo_square.m rename to src/LFO/lfo_square.m diff --git a/src/Select/LFOSelect.m b/src/Select/LFOSelect.m index 05bdfb7..4cb29ac 100644 --- a/src/Select/LFOSelect.m +++ b/src/Select/LFOSelect.m @@ -9,10 +9,13 @@ function output = LFOSelect(amplitude, frequency, phase, fs, duration, input,number) %UNTITLED Summary of this function goes here % Detailed explanation goes here - if(number == "AmplitudeSawtooth") + if(number == "AmplitudeSine") output = lfo_sawtooth(amplitude, frequency, phase, fs, duration, input); - elseif(number == "AmplitudeSine") + elseif(number == "AmplitudeSquare") + output = lfo_square(amplitude, frequency, phase, fs, duration, input); + elseif(number == "AmplitudeSawtooth") output = lfo_sine(amplitude, frequency, phase, fs, duration, input); + elseif(number == "FrequencySine") output = lfo_freq_sine(amplitude, frequency, phase, fs, duration, input); elseif(number == "FrequencySquare") diff --git a/src/Select/SoundGeneratorSelect.m b/src/Select/SoundGeneratorSelect.m index 35ebd64..79d61a1 100644 --- a/src/Select/SoundGeneratorSelect.m +++ b/src/Select/SoundGeneratorSelect.m @@ -56,6 +56,9 @@ function output = SoundGeneratorSelect(amplitude, frequency, phase, fs, duration output = generate_trumpet(amplitude, frequency, phase, fs, duration, duty); elseif(number == "TubularBells") output = generate_tubularBells(amplitude, frequency, phase, fs, duration, duty); + + elseif(number == "Keyboard") + output = generate_keyboard(amplitude, frequency, phase, fs, duration, duty); else output = zeros(1, fs * duration); end