Diff: OSCtoCV_Sequencer.cpp

Revision:

4:fe335dc8d53d

Parent:

3:d945a20b1e31

Child:

5:abe335652add

--- a/OSCtoCV_Sequencer.cpp	Sun Jan 31 12:55:17 2016 +0000
+++ b/OSCtoCV_Sequencer.cpp	Tue Feb 16 11:31:12 2016 +0000
@@ -19,18 +19,13 @@
     static int _resetCount, resetCount;
     static uint8_t gateMode;
     static uint8_t _gateMode[16];
-    static uint8_t ch, qmode, amode;
+    static uint8_t ch;
     static float glidecv[8], shiftcv[8];
     unsigned int cv;
     static float qcv;
     static int jitter, jitterCount;
-        
-    qmode = (gCtrl[1] * (SCALE_NUM - 1.0f));  // Sequencer Quantize Mode (gCtrl[1])
-    amode = SCALE_AOUT * qmode;
-    
-    gAOUT.write_u16(amode);
-    
-    switch (qmode) 
+
+    switch (CheckQuantizeMode()) 
     {
         case Lin:
 
@@ -201,6 +196,10 @@
             sendMes.setTopAddress(RESET_COUNTER_ADDRESS);
             sendMes.setArgs("i", (resetCount + 1));
             osc.sendOsc(&sendMes);
+            
+            sendMes.setTopAddress("/ctrl5");
+            sendMes.setArgs("f", gCtrl[4]);
+            osc.sendOsc(&sendMes);
         }
         
         if (currentStep > resetCount)  // reset
@@ -267,19 +266,14 @@
     static uint8_t gateMode;
     static uint8_t _gateMode[8];
     static uint8_t _pulseCount[8];
-    static uint8_t ch, qmode, amode;
+    static uint8_t ch;
     static float glidecv[8], shiftcv[8];
     unsigned int cv;
     static float qcv;
     static int jitterCount;
     static int jitter;
-    
-    qmode = (gCtrl[1] * (SCALE_NUM - 1));  // Sequencer Quantize Mode (gCtrl[1])
-    amode = SCALE_AOUT * qmode;
-    
-    gAOUT.write_u16(amode);
-    
-    switch (qmode) 
+
+    switch (CheckQuantizeMode()) 
     {
         case Lin:
 
@@ -466,6 +460,10 @@
                 sendMes.setTopAddress(RESET185_COUNTER_ADDRESS);
                 sendMes.setArgs("i", (resetCount + 1));
                 osc.sendOsc(&sendMes);
+                
+                sendMes.setTopAddress("/ctrl6");
+                sendMes.setArgs("f", gCtrl[5]);
+                osc.sendOsc(&sendMes);
             }
 
             if (currentStep > resetCount) // reset
@@ -524,19 +522,14 @@
     static uint8_t gateMode;
     static uint8_t _gateMode[8];
     static uint8_t _pulseCount[8];
-    static uint8_t ch, qmode, amode;
+    static uint8_t ch;
     static float glidecv[8], shiftcv[8];
     unsigned int cv;
     static float qcv;
     static int jitterCount;
     static int jitter;
     
-    qmode = (gCtrl[1] * (SCALE_NUM - 1));  // Sequencer Quantize Mode (gCtrl[1])
-    amode = SCALE_AOUT * qmode;
-    
-    gAOUT.write_u16(amode);
-    
-    switch (qmode) 
+    switch (CheckQuantizeMode()) 
     {
         case Lin:
 
@@ -723,6 +716,10 @@
                 sendMes.setTopAddress(RESET185_COUNTER_ADDRESS);
                 sendMes.setArgs("i", (resetCount + 1));
                 osc.sendOsc(&sendMes);
+                
+                sendMes.setTopAddress("/ctrl6");
+                sendMes.setArgs("f", gCtrl[5]);
+                osc.sendOsc(&sendMes);
             }
 
             if (currentStep > resetCount) // reset
@@ -870,6 +867,10 @@
                 sendMes.setTopAddress(BEATS_COUNTER_ADDRESS);
                 sendMes.setArgs("i", (resetCount + 1));
                 osc.sendOsc(&sendMes);
+                
+                sendMes.setTopAddress("/ctrl8");
+                sendMes.setArgs("f", gCtrl[7]);
+                osc.sendOsc(&sendMes);
             }
 
             if (currentStep > resetCount) // reset