Remove debug code and clean some if conditions up a bit

Author: benirose

software/src/applets/ProbabilityDivider.h

@@ -46,6 +46,7 @@ class ProbabilityDivider : public HemisphereApplet {
         loop_index = 0;
         loop_step = 0;
         skip_steps = 0;
+        bypass_loop = false;
         ForEachChannel(ch) {
             GateOut(ch, false);
         }
@@ -63,7 +64,7 @@ class ProbabilityDivider : public HemisphereApplet {
             // TODO: regenerate if changing from 0?
         }
 
-        loop_linker.SetLooping(loop_length_mod > 0);
+        loop_linker.SetLooping(loop_length_mod > 0 && !bypass_loop);
 
         // reset
         if (Clock(1)) {
@@ -87,6 +88,12 @@ class ProbabilityDivider : public HemisphereApplet {
                 reseed_high = false;
             }
 
+            if (reseed < -(HEMISPHERE_MAX_CV >> 1)) {
+                bypass_loop = true;
+            } else {
+                bypass_loop = false;
+            }
+
             // reset loop
             if (loop_length_mod > 0 && loop_step >= loop_length_mod) {
                 loop_step = 0;
@@ -107,10 +114,12 @@ class ProbabilityDivider : public HemisphereApplet {
                 return;
             }
 
-            // get next weighted div or next div from loop
+            // always advance the loop if looping is active
             if (loop_length_mod > 0) {
                 skip_steps = GetNextLoopDiv();
-            } else {
+            } 
+            // get a random div if loop is not active or if loop is in bypass, this might replace the value above
+            if (loop_length_mod == 0 || bypass_loop) {
                 skip_steps = GetNextWeightedDiv();
             }
 
@@ -136,19 +145,11 @@ class ProbabilityDivider : public HemisphereApplet {
     }
 
     void View() {
-        if (showDebug) {
-            DrawDebug();
-        } else {
-            DrawInterface();
-        }
+        DrawInterface();
     }
 
     // void OnButtonPress() { }
 
-    void AuxButton() {
-        showDebug = !showDebug;
-    }
-
     void OnEncoderMove(int direction) {
         if (!EditMode()) {
             MoveCursor(cursor, direction, LAST_SETTING);
@@ -230,8 +231,7 @@ class ProbabilityDivider : public HemisphereApplet {
     int loop_step;
     // used to keep track of reseed cv inputs so it only reseeds on rising edge
     bool reseed_high;
-
-    bool showDebug = false;
+    bool bypass_loop;
 
     int skip_steps;
     int pulse_animation = 0;
@@ -275,29 +275,6 @@ class ProbabilityDivider : public HemisphereApplet {
         }
     }
 
-    void DrawDebug() {
-        int disp_seed = loop_linker.GetSeed(); //0xABCD // test display accuracy
-        char sz[2];
-        sz[1] = 0; // Null terminated string for easy print
-        gfxPos(1, 15);
-        for (int i = 3; i >= 0; --i) {
-          // Grab each nibble in turn, starting with most significant
-          int nib = (disp_seed >> (i * 4)) & 0xF;
-          if (nib <= 9) {
-            gfxPrint(nib);
-          } else {
-            sz[0] = 'a' + nib - 10;
-            gfxPrint(static_cast<const char *>(sz));
-          }
-        }
-        for (int i = 0; i < 16; i++) {
-            int xOffset = (i % 4) * 12;
-            int yOffset = (i / 4) * 10;
-            gfxPrint(1 + xOffset, 25 + yOffset, loop[i]);
-            gfxPrint(",");
-        }
-    }
-
     int GetNextWeightedDiv() {
         int total_weights = 0;
 

software/src/applets/ProbabilityMelody.h

@@ -136,21 +136,12 @@ class ProbabilityMelody : public HemisphereApplet {
     }
 
     void View() {
-        if (showDebug) {
-            DrawDebug();
-        } else {
-            DrawParams();
-            DrawKeyboard();    
-        }
-        
+        DrawParams();
+        DrawKeyboard();
     }
 
     // void OnButtonPress() { }
 
-    void AuxButton() {
-        showDebug = !showDebug;
-    }
-
     void OnEncoderMove(int direction) {
         if (!EditMode()) {
             MoveCursor(cursor, direction, CV_MODE);
@@ -233,8 +224,6 @@ class ProbabilityMelody : public HemisphereApplet {
     int8_t cv_mode = 0;
     bool regen = false;
 
-    bool showDebug = false;
-
     ProbLoopLinker &loop_linker = ProbLoopLinker::get();
 
     int value_animation = 0;
@@ -464,37 +453,6 @@ class ProbabilityMelody : public HemisphereApplet {
         }
     }
 
-    void DrawDebug() {
-        int full_seed = 0;
-        for (int p = 0; p < 12; p++) {
-            full_seed ^= (weights[p] < 0 ? 0 : weights[p]) << p;
-        }
-        full_seed ^= ((up_mod << 6) | down_mod);
-        full_seed |= (loop_linker.GetSeed() << 16);
-        char sz2[2];
-        sz2[1] = 0; // Null terminated string for easy print
-        gfxPos(1, 15);
-        for (int i = 7; i >= 0; --i) {
-          // Grab each nibble in turn, starting with most significant
-          int nib2 = (full_seed >> (i * 4)) & 0xF;
-          if (nib2 <= 9) {
-            gfxPrint(nib2);
-          } else {
-            sz2[0] = 'a' + nib2 - 10;
-            gfxPrint(static_cast<const char *>(sz2));
-          }
-        }
-        // gfxPrint(1,35,down);
-        // gfxPrint(20,35,up);
-
-        for (int i = 0; i < 16; i++) {
-            int xOffset = (i % 4) * 16;
-            int yOffset = (i / 4) * 10;
-            gfxPrint(1 + xOffset, 25 + yOffset, seqloop[0][i]);
-            gfxPrint(",");
-        }
-    }
-
     void gfxPrintOctDotSemi(int x, int y, int semitone) {
         gfxPrint(x, y, ((semitone - 1) / 12) + 1);
         gfxPrint(x + 5, y, ".");