Diff: main.cpp

Revision:

17:557658db3e81

Parent:

16:b0419e3c9079

Child:

18:309f794eba74

--- a/main.cpp	Tue Aug 23 10:02:18 2016 +0000
+++ b/main.cpp	Tue Aug 23 10:29:06 2016 +0000
@@ -15,6 +15,7 @@
 #include "EnvelopeGenerator.h"
 #include "SpiAmpController.h"
 #include "SpiFilterController.h"
+#include "ST7565_SequencerDisplay.h"
 
 #define TITLE_STR1  ("BaseMachine Sequencer")
 #define TITLE_STR2  ("20160823")
@@ -61,6 +62,8 @@
 
 SpiFilterController filterController(&spiMaster, D10);
 
+ST7565_SequencerDisplay sequencerDisplay(&gLCD, sequences, SEQUENCE_N);
+
 volatile int currentStep = 0;
 volatile bool isRunning = false;
 volatile bool isDirty = false;
@@ -106,9 +109,11 @@
     envelopeGenerator.update();
     
     filterController.outDcf();
+    
+    // ToDo: 再生中のLCD表示を検討→SPI1とSPI2の信号のタイミングを調査
+    //sequencerDisplay.update(SequencerDisplay::stop, sequenceSender.getStep());
 }
 
-
 //------------------------------------------------------------------------
 // Functions
 //------------------------------------------------------------------------
@@ -173,6 +178,11 @@
     gLCD.display();
     Thread::wait(1000);
     
+    dumpToLCD();
+    Thread::wait(1000);
+    
+    sequencerDisplay.update(SequencerDisplay::stop, 0);
+    
     // Test SequencerSender Run
     //
     Sequence::setBaseNoteNumber(baseNoteNumber);
@@ -219,7 +229,5 @@
             envelope.getSustain()
         );
         #endif
-        
-        //dumpToLCD();
     }
 }