Integrated version

Revision:
4:0a55042fa86c
Parent:
3:f790643458d9
Child:
5:c3ed523c0330
--- a/BaseMachineUIController.h	Mon Nov 07 00:32:05 2016 +0000
+++ b/BaseMachineUIController.h	Wed Nov 09 08:06:37 2016 +0000
@@ -99,10 +99,13 @@
 
         RotEncStep  = new RotaryEncoder(PA_11, PA_12, 0, SEQUENCE_N - 1, 0);
         RotEncPitch = new RotaryEncoder(PB_5, PB_4, 0, Sequence::getMaxPitch() - 1, 0);
-        RotEncBpm   = new RotaryEncoder(PC_12, PC_10, bpmMin, bpmMax, 120);
+        //RotEncBpm   = new RotaryEncoder(PC_12, PC_10, bpmMin, bpmMax, 120);
+        RotEncBpm   = new RotaryEncoder(PA_14, PA_15, bpmMin, bpmMax, 120);
 
-        PinWaveShape  = new PinDetect(PD_2, PullUp);
-        PinUIMode     = new PinDetect(PC_11, PullUp);
+        //PinWaveShape  = new PinDetect(PD_2, PullUp);
+        PinWaveShape  = new PinDetect(PB_7, PullUp);
+        //PinUIMode     = new PinDetect(PC_11, PullUp);
+        PinUIMode     = new PinDetect(PC_13, PullUp);
         PinOctaveUp   = new PinDetect(PB_3, PullUp);
         PinOctaveDown = new PinDetect(PA_10, PullUp);
         PinNoteOnOff  = new PinDetect(PC_5, PullUp);