Diff: main.cpp

Revision:

15:9813d8eaf57e

Parent:

14:c173e03ee3ad

Child:

16:b0419e3c9079

--- a/main.cpp	Tue Aug 02 22:37:09 2016 +0000
+++ b/main.cpp	Tue Aug 23 09:45:37 2016 +0000
@@ -1,3 +1,11 @@
+/*
+ * main.cpp
+ * SpiSequencerSender_test
+ *
+ * 2016.08.20 mbed Rev 121 / mbed-rtos Rev 117で動作確認
+ *
+ */
+
 #include "mbed.h"
 #include "rtos.h"
 
@@ -46,7 +54,7 @@
         envelopeGenerator.init(envelope);
     }
 
-    if (sequenceSender.getSequences()[sequenceSender.getStep()].noteOn) {
+    if (sequenceSender.getSequences()[sequenceSender.getStep()].isNoteOn()) {
         uint16_t level = envelopeGenerator.getModLevel();
         ampController.outDca(level);
     } else {
@@ -54,7 +62,7 @@
     }
     envelopeGenerator.update();
     
-    filterController.outDCF();
+    filterController.outDcf();
 }
 
 int main()
@@ -64,15 +72,15 @@
     
     // Test SequencerSender Run
     //
-    Sequence::baseNoteNumber = baseNoteNumber;
+    Sequence::setBaseNoteNumber(baseNoteNumber);
     sequenceSender.setBpm(bpm);
     
     for (int i = 0; i < SEQUENCE_N; i++) {
         Sequence& seq = sequenceSender.getSequences()[i];
         seq.setPitch(pitch[i]);
         seq.setOctave(octave[i]);
-        seq.noteOn = noteOn[i];
-        seq.tie = tie[i];
+        seq.setNoteOn(noteOn[i]);
+        seq.setTie(tie[i]);
     }
     
     envelopeGenerator.init(envelope);