band limited oscillators

5 files changed, 186 insertions, 65 deletions

diff --git a/main.cpp b/main.cpp
index 8c975b1..cf7b730 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1,74 +1,33 @@
 #include "maximilian.h"
 
-//This shows how to use maximilian to build a polyphonic synth.
+//Look mum no aliasing
 
-//These are the synthesiser bits
-maxiOsc VCO1[6],VCO2[6],LFO1[6],LFO2[6];
-maxiFilter VCF[6];
-maxiEnvelope ADSR[6];
-
-//These are the control values for the envelope
-
-double adsrEnv[8]={1,5,0.125,100,0.125,200,0,1000};
-
-//This is a bunch of control signals so that we can hear something
-
-maxiOsc timer;//this is the metronome
-int currentCount,lastCount,voice=0;//these values are used to check if we have a new beat this sample
-
-//and these are some variables we can use to pass stuff around
-
-double VCO1out[6],VCO2out[6],LFO1out[6],LFO2out[6],VCFout[6],ADSRout[6],mix,pitch[6];
+//synthesiser bits
+maxiOsc VCO1,VCO2;
+maxiOsc ramp,ramp2,ramp3;
+double out;
 
 
 void setup() {//some inits
-	
-	
+    
+    //we need this to set the duty cycle for the sqaure wave otherwise it don't work
+	VCO2.phaseReset(0.5);
+    
 }
 
 void play(double *output) {
-	
-	mix=0;//we're adding up the samples each update and it makes sense to clear them each time first.
-	
-	//so this first bit is just a basic metronome so we can hear what we're doing.
-	
-	currentCount=(int)timer.phasor(8);//this sets up a metronome that ticks 8 times a second
-	
-	if (lastCount!=currentCount) {//if we have a new timer int this sample, play the sound
-		
-		if (voice==6) {
-			voice=0;
-		}
-		
-		ADSR[voice].trigger(0, adsrEnv[0]);//trigger the envelope from the start
-		pitch[voice]=voice+1;
-		voice++;
-        
-		lastCount=0;
-        
-	}
+
+//      no noise here
+      out=VCO1.sawn(ramp.phasor(0.1,50,8000));
+
+    
+//      Band limited square using two band limited saws. Comment the above and uncomment the below.
+//      you can hear a tiny bit of aliasing approaching 8000 hz but it should do.
+//      It's actually a bit of a weird hack but has nice response all the same.
+//      out=VCO1.sawn(ramp.phasor(0.1,50,8000))-VCO2.sawn(ramp2.phasor(0.1,50,8000));
+    
     
-	//and this is where we build the synth
-	
-	for (int i=0; i<6; i++) {
-		
-        
-        ADSRout[i]=ADSR[i].line(8,adsrEnv);//our ADSR env has 8 value/time pairs.
-        
-        LFO1out[i]=LFO1[i].sinebuf(0.2);//this lfo is a sinewave at 0.2 hz
-        
-        VCO1out[i]=VCO1[i].pulse(55*pitch[i],0.6);//here's VCO1. it's a pulse wave at 55 hz, with a pulse width of 0.6
-        VCO2out[i]=VCO2[i].pulse((110*pitch[i])+LFO1out[i],0.2);//here's VCO2. it's a pulse wave at 110hz with LFO modulation on the frequency, and width of 0.2
-        
-        
-        VCFout[i]=VCF[i].lores((VCO1out[i]+VCO2out[i])*0.5, 250+((pitch[i]+LFO1out[i])*1000), 10);//now we stick the VCO's into the VCF, using the ADSR as the filter cutoff
-        
-        mix+=VCFout[i]*ADSRout[i]/6;//finally we add the ADSR as an amplitude modulator
-        
-		
-	}
-	
-	output[0]=mix*0.5;//left channel
-	output[1]=mix*0.5;//right channel
+	output[0]=out*0.5;//left channel
+	output[1]=out*0.5;//right channel
     
 }
diff --git a/maximilian.cpp b/maximilian.cpp
index 56190c6..6b967a5 100644
--- a/maximilian.cpp
+++ b/maximilian.cpp
@@ -59,6 +59,142 @@ int maxiSettings::bufferSize = 1024;
 double sineBuffer[514]={0,0.012268,0.024536,0.036804,0.049042,0.06131,0.073547,0.085785,0.097992,0.1102,0.12241,0.13455,0.1467,0.15884,0.17093,0.18301,0.19507,0.20709,0.21909,0.23105,0.24295,0.25485,0.26669,0.2785,0.29025,0.30197,0.31366,0.32529,0.33685,0.34839,0.35986,0.37128,0.38266,0.39395,0.40521,0.41641,0.42752,0.4386,0.44958,0.46051,0.47137,0.48215,0.49286,0.50351,0.51407,0.52457,0.53497,0.54529,0.55554,0.5657,0.57578,0.58575,0.59567,0.60547,0.6152,0.62482,0.63437,0.6438,0.65314,0.66238,0.67151,0.68057,0.68951,0.69833,0.70706,0.7157,0.72421,0.7326,0.74091,0.74908,0.75717,0.76514,0.77298,0.7807,0.7883,0.79581,0.80316,0.81042,0.81754,0.82455,0.83142,0.8382,0.84482,0.85132,0.8577,0.86392,0.87006,0.87604,0.88187,0.8876,0.89319,0.89862,0.90396,0.90912,0.91415,0.91907,0.92383,0.92847,0.93295,0.93729,0.9415,0.94556,0.94949,0.95325,0.95691,0.96039,0.96375,0.96692,0.97,0.9729,0.97565,0.97827,0.98074,0.98306,0.98523,0.98724,0.98914,0.99084,0.99243,0.99387,0.99515,0.99628,0.99725,0.99808,0.99875,0.99927,0.99966,0.99988,0.99997,0.99988,0.99966,0.99927,0.99875,0.99808,0.99725,0.99628,0.99515,0.99387,0.99243,0.99084,0.98914,0.98724,0.98523,0.98306,0.98074,0.97827,0.97565,0.9729,0.97,0.96692,0.96375,0.96039,0.95691,0.95325,0.94949,0.94556,0.9415,0.93729,0.93295,0.92847,0.92383,0.91907,0.91415,0.90912,0.90396,0.89862,0.89319,0.8876,0.88187,0.87604,0.87006,0.86392,0.8577,0.85132,0.84482,0.8382,0.83142,0.82455,0.81754,0.81042,0.80316,0.79581,0.7883,0.7807,0.77298,0.76514,0.75717,0.74908,0.74091,0.7326,0.72421,0.7157,0.70706,0.69833,0.68951,0.68057,0.67151,0.66238,0.65314,0.6438,0.63437,0.62482,0.6152,0.60547,0.59567,0.58575,0.57578,0.5657,0.55554,0.54529,0.53497,0.52457,0.51407,0.50351,0.49286,0.48215,0.47137,0.46051,0.44958,0.4386,0.42752,0.41641,0.40521,0.39395,0.38266,0.37128,0.35986,0.34839,0.33685,0.32529,0.31366,0.30197,0.29025,0.2785,0.26669,0.25485,0.24295,0.23105,0.21909,0.20709,0.19507,0.18301,0.17093,0.15884,0.1467,0.13455,0.12241,0.1102,0.097992,0.085785,0.073547,0.06131,0.049042,0.036804,0.024536,0.012268,0,-0.012268,-0.024536,-0.036804,-0.049042,-0.06131,-0.073547,-0.085785,-0.097992,-0.1102,-0.12241,-0.13455,-0.1467,-0.15884,-0.17093,-0.18301,-0.19507,-0.20709,-0.21909,-0.23105,-0.24295,-0.25485,-0.26669,-0.2785,-0.29025,-0.30197,-0.31366,-0.32529,-0.33685,-0.34839,-0.35986,-0.37128,-0.38266,-0.39395,-0.40521,-0.41641,-0.42752,-0.4386,-0.44958,-0.46051,-0.47137,-0.48215,-0.49286,-0.50351,-0.51407,-0.52457,-0.53497,-0.54529,-0.55554,-0.5657,-0.57578,-0.58575,-0.59567,-0.60547,-0.6152,-0.62482,-0.63437,-0.6438,-0.65314,-0.66238,-0.67151,-0.68057,-0.68951,-0.69833,-0.70706,-0.7157,-0.72421,-0.7326,-0.74091,-0.74908,-0.75717,-0.76514,-0.77298,-0.7807,-0.7883,-0.79581,-0.80316,-0.81042,-0.81754,-0.82455,-0.83142,-0.8382,-0.84482,-0.85132,-0.8577,-0.86392,-0.87006,-0.87604,-0.88187,-0.8876,-0.89319,-0.89862,-0.90396,-0.90912,-0.91415,-0.91907,-0.92383,-0.92847,-0.93295,-0.93729,-0.9415,-0.94556,-0.94949,-0.95325,-0.95691,-0.96039,-0.96375,-0.96692,-0.97,-0.9729,-0.97565,-0.97827,-0.98074,-0.98306,-0.98523,-0.98724,-0.98914,-0.99084,-0.99243,-0.99387,-0.99515,-0.99628,-0.99725,-0.99808,-0.99875,-0.99927,-0.99966,-0.99988,-0.99997,-0.99988,-0.99966,-0.99927,-0.99875,-0.99808,-0.99725,-0.99628,-0.99515,-0.99387,-0.99243,-0.99084,-0.98914,-0.98724,-0.98523,-0.98306,-0.98074,-0.97827,-0.97565,-0.9729,-0.97,-0.96692,-0.96375,-0.96039,-0.95691,-0.95325,-0.94949,-0.94556,-0.9415,-0.93729,-0.93295,-0.92847,-0.92383,-0.91907,-0.91415,-0.90912,-0.90396,-0.89862,-0.89319,-0.8876,-0.88187,-0.87604,-0.87006,-0.86392,-0.8577,-0.85132,-0.84482,-0.8382,-0.83142,-0.82455,-0.81754,-0.81042,-0.80316,-0.79581,-0.7883,-0.7807,-0.77298,-0.76514,-0.75717,-0.74908,-0.74091,-0.7326,-0.72421,-0.7157,-0.70706,-0.69833,-0.68951,-0.68057,-0.67151,-0.66238,-0.65314,-0.6438,-0.63437,-0.62482,-0.6152,-0.60547,-0.59567,-0.58575,-0.57578,-0.5657,-0.55554,-0.54529,-0.53497,-0.52457,-0.51407,-0.50351,-0.49286,-0.48215,-0.47137,-0.46051,-0.44958,-0.4386,-0.42752,-0.41641,-0.40521,-0.39395,-0.38266,-0.37128,-0.35986,-0.34839,-0.33685,-0.32529,-0.31366,-0.30197,-0.29025,-0.2785,-0.26669,-0.25485,-0.24295,-0.23105,-0.21909,-0.20709,-0.19507,-0.18301,-0.17093,-0.15884,-0.1467,-0.13455,-0.12241,-0.1102,-0.097992,-0.085785,-0.073547,-0.06131,-0.049042,-0.036804,-0.024536,-0.012268,0,0.012268
 };
 
+double transition[1001]={-0.500003,-0.500003,-0.500023,-0.500063,-0.500121,-0.500179,-0.500259,
+    -0.50036,-0.500476,-0.500591,-0.500732,-0.500893,-0.501066,-0.501239,
+    -0.50144,-0.501661,-0.501891,-0.502123,-0.502382,-0.502662,-0.502949,
+    -0.50324,-0.503555,-0.503895,-0.504238,-0.504587,-0.504958,-0.505356,
+    -0.505754,-0.506162,-0.506589,-0.507042,-0.507495,-0.50796,-0.508444,
+    -0.508951,-0.509458,-0.509979,-0.510518,-0.511079,-0.511638,-0.512213,
+    -0.512808,-0.51342,-0.51403,-0.514659,-0.515307,-0.51597,-0.51663,-0.517312,
+    -0.518012,-0.518724,-0.519433,-0.520166,-0.520916,-0.521675,-0.522432,
+    -0.523214,-0.524013,-0.524819,-0.525624,-0.526451,-0.527298,-0.528147,
+    -0.528999,-0.52987,-0.530762,-0.531654,-0.532551,-0.533464,-0.534399,
+    -0.535332,-0.536271,-0.537226,-0.538202,-0.539172,-0.540152,-0.541148,
+    -0.542161,-0.543168,-0.544187,-0.54522,-0.546269,-0.54731,-0.548365,
+    -0.549434,-0.550516,-0.55159,-0.552679,-0.553781,-0.554893,-0.555997,
+    -0.557118,-0.558252,-0.559391,-0.560524,-0.561674,-0.562836,-0.564001,
+    -0.565161,-0.566336,-0.567524,-0.568712,-0.569896,-0.571095,-0.572306,
+    -0.573514,-0.574721,-0.575939,-0.577171,-0.578396,-0.579622,-0.580858,
+    -0.582108,-0.583348,-0.58459,-0.585842,-0.587106,-0.588358,-0.589614,
+    -0.590879,-0.592154,-0.593415,-0.594682,-0.595957,-0.59724,-0.598507,
+    -0.599782,-0.601064,-0.602351,-0.603623,-0.604902,-0.606189,-0.607476,
+    -0.60875,-0.610032,-0.611319,-0.612605,-0.613877,-0.615157,-0.616443,
+    -0.617723,-0.618992,-0.620268,-0.621548,-0.62282,-0.624083,-0.62535,
+    -0.626622,-0.627882,-0.629135,-0.630391,-0.631652,-0.632898,-0.634138,
+    -0.63538,-0.636626,-0.637854,-0.639078,-0.640304,-0.641531,-0.642739,
+    -0.643943,-0.645149,-0.646355,-0.647538,-0.64872,-0.649903,-0.651084,
+    -0.652241,-0.653397,-0.654553,-0.655705,-0.656834,-0.657961,-0.659087,
+    -0.660206,-0.661304,-0.662399,-0.663492,-0.664575,-0.665639,-0.666699,
+    -0.667756,-0.6688,-0.669827,-0.670849,-0.671866,-0.672868,-0.673854,
+    -0.674835,-0.675811,-0.676767,-0.677709,-0.678646,-0.679576,-0.680484,
+    -0.68138,-0.682269,-0.683151,-0.684008,-0.684854,-0.685693,-0.686524,
+    -0.687327,-0.688119,-0.688905,-0.689682,-0.690428,-0.691164,-0.691893,
+    -0.692613,-0.6933,-0.693978,-0.694647,-0.695305,-0.695932,-0.696549,
+    -0.697156,-0.697748,-0.698313,-0.698865,-0.699407,-0.699932,-0.700431,
+    -0.700917,-0.701391,-0.701845,-0.702276,-0.702693,-0.703097,-0.703478,
+    -0.703837,-0.704183,-0.704514,-0.704819,-0.705105,-0.705378,-0.705633,
+    -0.70586,-0.706069,-0.706265,-0.706444,-0.706591,-0.706721,-0.706837,
+    -0.706938,-0.707003,-0.707051,-0.707086,-0.707106,-0.707086,-0.707051,
+    -0.707001,-0.706935,-0.706832,-0.706711,-0.706576,-0.706421,-0.706233,
+    -0.706025,-0.705802,-0.705557,-0.705282,-0.704984,-0.704671,-0.704334,
+    -0.703969,-0.703582,-0.703176,-0.702746,-0.702288,-0.70181,-0.701312,
+    -0.700785,-0.700234,-0.699664,-0.69907,-0.698447,-0.6978,-0.697135,
+    -0.696446,-0.695725,-0.694981,-0.694219,-0.693435,-0.692613,-0.691771,
+    -0.690911,-0.69003,-0.689108,-0.688166,-0.687206,-0.686227,-0.685204,
+    -0.684162,-0.683101,-0.682019,-0.680898,-0.679755,-0.678592,-0.677407,
+    -0.676187,-0.674941,-0.673676,-0.672386,-0.671066,-0.669718,-0.66835,
+    -0.666955,-0.665532,-0.664083,-0.662611,-0.661112,-0.659585,-0.658035,
+    -0.656459,-0.654854,-0.653223,-0.651572,-0.649892,-0.648181,-0.646446,
+    -0.644691,-0.642909,-0.641093,-0.639253,-0.637393,-0.63551,-0.633588,
+    -0.631644,-0.62968,-0.627695,-0.625668,-0.623621,-0.621553,-0.619464,
+    -0.617334,-0.615183,-0.613011,-0.610817,-0.608587,-0.606333,-0.604058,
+    -0.60176,-0.599429,-0.597072,-0.594695,-0.592293,-0.589862,-0.587404,
+    -0.584925,-0.58242,-0.579888,-0.577331,-0.574751,-0.572145,-0.569512,
+    -0.566858,-0.564178,-0.561471,-0.558739,-0.555988,-0.553209,-0.550402,
+    -0.547572,-0.544723,-0.54185,-0.538944,-0.536018,-0.533072,-0.530105,
+    -0.527103,-0.524081,-0.52104,-0.51798,-0.514883,-0.511767,-0.508633,
+    -0.505479,-0.502291,-0.499083,-0.495857,-0.492611,-0.489335,-0.486037,
+    -0.48272,-0.479384,-0.476021,-0.472634,-0.46923,-0.465805,-0.462356,
+    -0.458884,-0.455394,-0.451882,-0.448348,-0.444795,-0.44122,-0.437624,
+    -0.434008,-0.430374,-0.426718,-0.423041,-0.419344,-0.415631,-0.411897,
+    -0.40814,-0.404365,-0.400575,-0.396766,-0.392933,-0.389082,-0.385217,
+    -0.381336,-0.377428,-0.373505,-0.369568,-0.365616,-0.361638,-0.357645,
+    -0.353638,-0.349617,-0.345572,-0.341512,-0.337438,-0.33335,-0.329242,
+    -0.325118,-0.32098,-0.316829,-0.31266,-0.308474,-0.304276,-0.300063,
+    -0.295836,-0.291593,-0.287337,-0.283067,-0.278783,-0.274487,-0.270176,
+    -0.265852,-0.261515,-0.257168,-0.252806,-0.248431,-0.244045,-0.239649,
+    -0.23524,-0.230817,-0.226385,-0.221943,-0.21749,-0.213024,-0.208548,
+    -0.204064,-0.199571,-0.195064,-0.190549,-0.186026,-0.181495,-0.176952,
+    -0.1724,-0.167842,-0.163277,-0.1587,-0.154117,-0.149527,-0.14493,-0.140325,
+    -0.135712,-0.131094,-0.12647,-0.121839,-0.117201,-0.112559,-0.10791,
+    -0.103257,-0.0985979,-0.0939343,-0.0892662,-0.0845935,-0.079917,-0.0752362,
+    -0.0705516,-0.0658635,-0.0611729,-0.0564786,-0.0517814,-0.0470818,-0.0423802,
+    -0.0376765,-0.0329703,-0.0282629,-0.0235542,-0.0188445,-0.0141335,-0.00942183,
+    -0.00470983,2.41979e-06,0.00471481,0.00942681,0.0141384,0.0188494,0.023559,
+    0.028268,0.0329754,0.0376813,0.0423851,0.0470868,0.0517863,0.0564836,
+    0.0611777,0.0658683,0.0705566,0.0752412,0.0799218,0.0845982,0.0892712,
+    0.0939393,0.0986028,0.103262,0.107915,0.112563,0.117206,0.121844,0.126475,
+    0.131099,0.135717,0.14033,0.144935,0.149531,0.154122,0.158705,0.163281,
+    0.167847,0.172405,0.176956,0.1815,0.18603,0.190553,0.195069,0.199576,
+    0.204068,0.208552,0.213028,0.217495,0.221947,0.226389,0.230822,0.235245,
+    0.239653,0.244049,0.248436,0.252811,0.257173,0.26152,0.265857,0.270181,
+    0.274491,0.278788,0.283071,0.287341,0.291597,0.29584,0.300068,0.30428,
+    0.308478,0.312664,0.316833,0.320984,0.325122,0.329246,0.333354,0.337442,
+    0.341516,0.345576,0.34962,0.353642,0.357649,0.361642,0.36562,0.369572,
+    0.373509,0.377432,0.38134,0.385221,0.389086,0.392936,0.39677,0.400579,
+    0.404369,0.408143,0.4119,0.415634,0.419347,0.423044,0.426721,0.430377,
+    0.434011,0.437627,0.441223,0.444798,0.448351,0.451885,0.455397,0.458887,
+    0.462359,0.465807,0.469232,0.472637,0.476024,0.479386,0.482723,0.486039,
+    0.489338,0.492613,0.49586,0.499086,0.502294,0.505481,0.508635,0.511769,
+    0.514885,0.517982,0.521042,0.524083,0.527105,0.530107,0.533074,0.53602,
+    0.538946,0.541851,0.544725,0.547574,0.550404,0.553211,0.555989,0.55874,
+    0.561472,0.564179,0.566859,0.569514,0.572146,0.574753,0.577332,0.579889,
+    0.582421,0.584926,0.587405,0.589863,0.592294,0.594696,0.597073,0.59943,
+    0.60176,0.604059,0.606333,0.608588,0.610818,0.613012,0.615183,0.617335,
+    0.619464,0.621553,0.623621,0.625669,0.627696,0.629681,0.631645,0.633588,
+    0.63551,0.637393,0.639253,0.641093,0.642909,0.644691,0.646446,0.648181,
+    0.649892,0.651572,0.653223,0.654854,0.656459,0.658035,0.659585,0.661112,
+    0.662611,0.664083,0.665532,0.666955,0.66835,0.669718,0.671066,0.672386,
+    0.673676,0.674941,0.676187,0.677407,0.678592,0.679755,0.680898,0.682019,
+    0.683101,0.684162,0.685204,0.686227,0.687206,0.688166,0.689108,0.69003,
+    0.690911,0.691771,0.692613,0.693435,0.694219,0.694981,0.695725,0.696447,
+    0.697135,0.6978,0.698447,0.69907,0.699664,0.700234,0.700786,0.701312,
+    0.70181,0.702288,0.702746,0.703177,0.703582,0.703969,0.704334,0.704671,
+    0.704984,0.705282,0.705557,0.705802,0.706025,0.706233,0.706422,0.706576,
+    0.706712,0.706832,0.706936,0.707002,0.707051,0.707086,0.707106,0.707086,
+    0.707051,0.707003,0.706939,0.706838,0.706721,0.706592,0.706445,0.706265,
+    0.70607,0.705861,0.705634,0.705378,0.705105,0.70482,0.704515,0.704184,
+    0.703837,0.703478,0.703097,0.702694,0.702276,0.701846,0.701392,0.700917,
+    0.700432,0.699932,0.699408,0.698866,0.698314,0.697749,0.697156,0.696549,
+    0.695933,0.695305,0.694648,0.693979,0.693301,0.692613,0.691894,0.691165,
+    0.690428,0.689683,0.688905,0.68812,0.687327,0.686525,0.685693,0.684854,
+    0.684009,0.683152,0.68227,0.68138,0.680485,0.679577,0.678647,0.67771,
+    0.676768,0.675811,0.674836,0.673855,0.672869,0.671867,0.670849,0.669827,
+    0.668801,0.667757,0.6667,0.66564,0.664576,0.663493,0.6624,0.661305,
+    0.660207,0.659088,0.657962,0.656834,0.655705,0.654553,0.653398,0.652241,
+    0.651085,0.649903,0.648721,0.647539,0.646356,0.645149,0.643944,0.642739,
+    0.641532,0.640304,0.639079,0.637855,0.636626,0.635381,0.634139,0.632899,
+    0.631652,0.630392,0.629136,0.627883,0.626622,0.62535,0.624083,0.62282,
+    0.621548,0.620268,0.618993,0.617724,0.616443,0.615158,0.613878,0.612605,
+    0.61132,0.610032,0.608751,0.607477,0.606189,0.604903,0.603623,0.602351,
+    0.601065,0.599782,0.598508,0.59724,0.595957,0.594682,0.593415,0.592154,
+    0.59088,0.589615,0.588359,0.587106,0.585843,0.584591,0.583349,0.582108,
+    0.580859,0.579623,0.578397,0.577172,0.575939,0.574721,0.573515,0.572307,
+    0.571095,0.569897,0.568713,0.567525,0.566337,0.565161,0.564002,0.562837,
+    0.561674,0.560525,0.559392,0.558252,0.557119,0.555998,0.554893,0.553782,
+    0.552679,0.55159,0.550516,0.549434,0.548365,0.54731,0.546269,0.54522,
+    0.544187,0.543168,0.542161,0.541148,0.540153,0.539173,0.538202,0.537226,
+    0.536271,0.535332,0.5344,0.533464,0.532551,0.531654,0.530762,0.52987,
+    0.528999,0.528147,0.527298,0.526451,0.525624,0.524819,0.524014,0.523214,
+    0.522432,0.521675,0.520916,0.520166,0.519433,0.518724,0.518012,0.517312,
+    0.51663,0.51597,0.515307,0.51466,0.51403,0.51342,0.512808,0.512213,
+    0.511638,0.511079,0.510518,0.509979,0.509458,0.508951,0.508444,0.50796,
+    0.507495,0.507042,0.506589,0.506162,0.505754,0.505356,0.504958,0.504587,
+    0.504237,0.503895,0.503555,0.50324,0.502949,0.502662,0.502382,0.502123,
+    0.501891,0.501661,0.50144,0.501239,0.501066,0.500893,0.500732,0.500591,
+    0.500476,0.50036,0.500259,0.500179,0.500121,0.500063,0.500023,0.500003,
+    0.500003};
+
 //This is a lookup table for converting midi to frequency
 double mtofarray[129]={0, 8.661957, 9.177024, 9.722718, 10.3, 10.913383, 11.562325, 12.25, 12.978271, 13.75, 14.567617, 15.433853, 16.351599, 17.323914, 18.354048, 19.445436, 20.601723, 21.826765, 23.124651, 24.5, 25.956543, 27.5, 29.135235, 30.867706, 32.703197, 34.647827, 36.708096, 38.890873, 41.203445, 43.65353, 46.249302, 49., 51.913086, 55., 58.27047, 61.735413, 65.406395, 69.295654, 73.416191, 77.781746, 82.406891, 87.30706, 92.498604, 97.998856, 103.826172, 110., 116.540939, 123.470825, 130.81279, 138.591309, 146.832382, 155.563492, 164.813782, 174.61412, 184.997208, 195.997711, 207.652344, 220., 233.081879, 246.94165, 261.62558, 277.182617,293.664764, 311.126984, 329.627563, 349.228241, 369.994415, 391.995422, 415.304688, 440., 466.163757, 493.883301, 523.25116, 554.365234, 587.329529, 622.253967, 659.255127, 698.456482, 739.988831, 783.990845, 830.609375, 880., 932.327515, 987.766602, 1046.502319, 1108.730469, 1174.659058, 1244.507935, 1318.510254, 1396.912964, 1479.977661, 1567.981689, 1661.21875, 1760., 1864.655029, 1975.533203, 2093.004639, 2217.460938, 2349.318115, 2489.015869, 2637.020508, 2793.825928, 2959.955322, 3135.963379, 3322.4375, 3520., 3729.31, 3951.066406, 4186.009277, 4434.921875, 4698.63623, 4978.031738, 5274.041016, 5587.651855, 5919.910645, 6271.926758, 6644.875, 7040., 7458.620117, 7902.132812, 8372.018555, 8869.84375, 9397.272461, 9956.063477, 10548.082031, 11175.303711, 11839.821289, 12543.853516, 13289.75};
 
@@ -189,7 +325,31 @@ double maxiOsc::saw(double frequency) {
 	phase += (1./(maxiSettings::sampleRate/(frequency)));
 	return(output);
 	
-} 
+}
+
+double maxiOsc::sawn(double frequency) {
+	//Bandlimited sawtooth generator. Woohoo.
+    if ( phase >= 0.5 ) phase -= 1.0;
+    phase += (1./(maxiSettings::sampleRate/(frequency)));
+	double temp=(8820.22/frequency)*phase;
+    if (temp<-0.5) {
+        temp=-0.5;
+    }
+    if (temp>0.5) {
+        temp=0.5;
+    }
+    temp*=1000.0f;
+    temp+=500.0f;
+    double remainder = temp - floor(temp);
+    output = (double) ((1.0f-remainder) * transition[(long)temp] + remainder * transition[1+(long)temp]) - phase;
+	return(output);
+	
+}
+
+double maxiOsc::rect(double frequency, double duty) {
+
+    return (output);
+}
 
 double maxiOsc::triangle(double frequency) {
     //This is a triangle wave.
diff --git a/maximilian.h b/maximilian.h
index de07d9a..0cac59d 100755
--- a/maximilian.h
+++ b/maximilian.h
@@ -85,6 +85,8 @@ public:
 	double noise();
 	double sinebuf(double frequency);
 	double sinebuf4(double frequency);
+    double sawn(double frequency);
+    double rect(double frequency, double duty=0.5);
 	void phaseReset(double phaseIn);
 	
 };
diff --git a/maximilianTest.xcodeproj/project.pbxproj b/maximilianTest.xcodeproj/project.pbxproj
index 8f95d2d..1c3367a 100755
--- a/maximilianTest.xcodeproj/project.pbxproj
+++ b/maximilianTest.xcodeproj/project.pbxproj
@@ -241,7 +241,7 @@
 				INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = macosx10.6;
+				SDKROOT = macosx10.7;
 			};
 			name = Debug;
 		};
@@ -261,7 +261,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = macosx10.6;
+				SDKROOT = macosx10.7;
 			};
 			name = Release;
 		};
diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate
index 8cdac65..ac761bd 100644
--- a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate