Diff: main.cpp

Revision:

12:9d6544cefd81

Parent:

11:51fdd053c7c2

--- a/main.cpp	Wed Aug 06 23:54:31 2014 +0000
+++ b/main.cpp	Sat Dec 06 00:00:58 2014 +0000
@@ -56,6 +56,9 @@
 Morse morse;    // LED1, dp24
 MIDI midi(dp16, dp15);
 REnc renc(dp1, dp2);
+DigitalOut isMidi(dp17);
+DigitalOut isNotMidi(dp18);
+
 
 int main()
 {
@@ -69,8 +72,8 @@
     midi.setHandleNoteOn(&proc_NoteOn);
     midi.setHandleControlChange(&proc_ControlChange);
     
-    renc.setHandleRight(&proc_REnc_right);
-    renc.setHandleLeft(&proc_REnc_left);
+    renc.setHandleCC(&proc_REnc_right);
+    renc.setHandleCCW(&proc_REnc_left);
  
     midi.begin();
     wait(1.0);
@@ -93,11 +96,16 @@
             srand( time(NULL) );
         }
         if (mode % 2) {
+            isNotMidi = 1;
+            isMidi = 0;
             for (i = 0; i < 5; i++) {
                 value = rand();
                 morse.code(codes[value % 26]);
             }
             morse.code(codes[26]);
+        } else {
+            isNotMidi = 0;
+            isMidi = 1;
         }
     }
 }