gauthiier/M-M-M
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

fixed _8_FM.ino Arduino sketch

Browse Source 
A conflict in github added some lines of text to the sketch that would
prevent it from compiling
This commit is contained in:
Jakob Bak 2013-05-22 09:36:47 +02:00
parent c147175bb2
commit fadc5cc783
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
software/lib/MMM/examples/Motion/_8_FM/_8_FM.ino
View File

@ -1,11 +1,7 @@
//FM synthes of a sort //FM synthes of a sort
<<<<<<< HEAD:software/lib/MMM/examples/Motion/_8_FM/_8_FM.ino
//hang on! (it's unstable and wants to limit cycle)
=======
//hang on! it's unstable and wants to limit cycle //hang on! it's unstable and wants to limit cycle
#define BIT_DEPTH 8 // gives us 16 Waveforms #define BIT_DEPTH 8 // gives us 16 Waveforms
>>>>>>> getting FM:software/apps/Modeling/FM/FM.ino
#include <Music.h> #include <Music.h>