Diff: OSCtoCV_Sequencer.cpp

Revision:

6:7fb15b1b5459

Parent:

5:abe335652add

--- a/OSCtoCV_Sequencer.cpp	Thu Feb 18 13:26:48 2016 +0000
+++ b/OSCtoCV_Sequencer.cpp	Thu Feb 25 11:21:37 2016 +0000
@@ -9,7 +9,7 @@
 //-------------------------------------------------------------
 // Sequence & Shift Out CV
 
-void ShiftCVSeq(int trigger, bool reset, unsigned int channelRange)
+void ShiftCVSeq(int trigger, bool reset, uint8_t channelRange)
 {
     int i, j;
     static bool triggerState = false;
@@ -247,7 +247,7 @@
 //-------------------------------------------------------------
 // M185 Sequencer
 
-void M185Seq(int trigger, bool reset, unsigned int channelRange)
+void M185Seq(int trigger, bool reset, uint8_t channelRange)
 {
     int i, j;
     static bool triggerState = false;
@@ -496,7 +496,7 @@
 //-------------------------------------------------------------
 // M185 Sequencer
 
-void PolyM185Seq(int trigger, bool reset, unsigned int channelRange)
+void PolyM185Seq(int trigger, bool reset, uint8_t channelRange)
 {
     int i, j;
     static bool triggerState = false;
@@ -733,8 +733,17 @@
 }
 
 //-------------------------------------------------------------
+// shift cv seq ch1 ~ ch4 m185 seq ch5 ~ ch8
+
+void PolyCVSeq(int trigger, bool reset)
+{
+    ShiftCVSeq(trigger, reset, CV_CHANNEL4);
+    PolyM185Seq(trigger, reset, CV_CHANNEL8);
+}
+
+//-------------------------------------------------------------
 // 8ch drum track sequecer
-unsigned int BeatsSeq(int trigger, bool reset, bool gatesOff)
+bool BeatsSeq(int trigger, bool reset, bool gatesOff)
 {
     int rndVel;
     static bool triggerState = false;
@@ -747,7 +756,6 @@
     static uint8_t ch;
     static float decay[8] = {1};
     
-        
     if (trigger && !triggerState) // trigger ON
     {
         if (stepCount != 0)
@@ -912,15 +920,6 @@
 }
 
 //-------------------------------------------------------------
-// shift cv seq ch1 ~ ch4 m185 seq ch5 ~ ch8
-
-void PolyCVSeq(int trigger, bool reset)
-{
-    ShiftCVSeq(trigger, reset, CV_CHANNEL4);
-    PolyM185Seq(trigger, reset, CV_CHANNEL8);
-}
-
-//-------------------------------------------------------------
 // check reset count & send osc
 
 void CheckResetCount(uint8_t resetCount, uint8_t mode)