getting FM

2013-05-21 09:16:07 -07:00
parent 646cd74442
commit c147175bb2
3 changed files with 8 additions and 3 deletions
@@ -1,8 +1,13 @@
 //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
+
+#define BIT_DEPTH 8 // gives us 16 Waveforms
+>>>>>>> getting FM:software/apps/Modeling/FM/FM.ino

 #include <Music.h>
-#define BIT_DEPTH 8 // gives us 16 Waveforms

 #include <Motor.h>