Merge branch 'production' of https://github.com/Chysn/O_C-HemisphereS…

…uite into production
Chysn · Nov 21, 2020 · 728d923 · 728d923
2 parents dc973e0 + ecfce80
commit 728d923
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/software/o_c_REV/HEM_AnnularFusion.ino b/software/o_c_REV/HEM_AnnularFusion.ino
@@ -113,6 +113,8 @@ public:
         beats[0] = Unpack(data, PackLocation {4,4}) + 1;
         length[1] = Unpack(data, PackLocation {8,4}) + 1;
         beats[1] = Unpack(data, PackLocation {12,4}) + 1;
+        SetDisplayPositions(0, 24);
+        SetDisplayPositions(1, 16);
     }
 
 protected:

diff --git a/software/o_c_REV/HEM_LowerRenz.ino b/software/o_c_REV/HEM_LowerRenz.ino
@@ -49,7 +49,7 @@ public:
             int32_t rho_h = SCALE8_16(constrain(rho + rho_cv, 4, 127));
             lorenz_m->SetRho(hemisphere, USAT16(rho_h));
 
-            if (Clock(0)) lorenz_m->Reset(hemisphere);
+            if (Clock(0, true)) lorenz_m->Reset(hemisphere);
             lorenz_m->Process();
 
             // The scaling here is based on observation of the value range
@@ -75,7 +75,7 @@ public:
         if (cursor == 0) freq = constrain(freq += direction, 0, 255);
         if (cursor == 1) rho = constrain(rho += direction, 4, 127);
     }
-        
+
     uint32_t OnDataRequest() {
         uint32_t data = 0;
         Pack(data, PackLocation {0,8}, (uint8_t)freq);
@@ -97,7 +97,7 @@ protected:
         help[HEMISPHERE_HELP_ENCODER]  = "Freq/Rho";
         //                               "------------------" <-- Size Guide
     }
-    
+
 private:
     LorenzGeneratorManager *lorenz_m = lorenz_m->get();
     int freq;