Diff: main.cpp

Revision:

9:3e4e08578e1c

Parent:

8:de409197ff95

Child:

10:fb04f9959fd9

--- a/main.cpp	Sun Jun 26 08:34:01 2016 +0000
+++ b/main.cpp	Sun Jun 26 09:51:40 2016 +0000
@@ -3,7 +3,8 @@
 
 #define UART_TRACE  (0)
 #include "SpiSequenceSender.h"
-#include "Envelope.h"
+#include "EnvelopeGenerator.h"
+#include "SpiAmpController.h"
 
 #define SEQUENCE_N  (16)
 #define SPI_RATE    (8000000)
@@ -14,26 +15,32 @@
 SpiSequenceSender sequenceSender(&spiMaster, D9, sequence, SEQUENCE_N, 10);
 
 Envelope envelope(4095, 10, 8, 5, 2047);
+EnvelopeGenerator envelopeGenerator;
+SpiAmpController ampController(&spiMaster, D8, D7);
 
+/*
 class TestClass {
 public:
     void callbackFunction(int ticks)
     {
         if (ticks == 0) {
-            envelope.init();
+            envelopeGenerator.init(envelope);
         }
-        uint16_t level = envelope.update();
+        uint16_t level = envelopeGenerator.update();
         printf("m,%d\r\n", level);
     }    
 } testClass;
+*/
 
 void callbackFunction(int ticks)
 {
     if (ticks == 0) {
-        envelope.init();
+        envelopeGenerator.init(envelope);
     }
-    uint16_t level = envelope.update();
-    printf("g,%d\r\n", level);
+    uint16_t level = envelopeGenerator.getModLevel();
+    //printf("g,%d\r\n", level);
+    ampController.outDca(level);
+    envelopeGenerator.update();
 }
 
 int main()
@@ -56,10 +63,10 @@
     sequence[11].setOctave(0);
     sequence[15].setOctave(1);
     
-    envelope.init();
+    envelopeGenerator.init(envelope);
     
-    sequenceSender.attachUpdate(&testClass, &TestClass::callbackFunction);
-    //sequenceSender.attachUpdate(&callbackFunction);
+    //sequenceSender.attachUpdate(&testClass, &TestClass::callbackFunction);
+    sequenceSender.attachUpdate(&callbackFunction);
     sequenceSender.run(0);
     
     for (;;) {