From a7fc9663da6bcfd539a100507b7d6e7fb171b639 Mon Sep 17 00:00:00 2001
From: Oleksiy <sleepy@sleepy.kiev.ua>
Date: Fri, 18 Oct 2024 15:46:34 +0300
Subject: [PATCH] UI tweaks for new modes

---
 Software/Gravity/Gravity.ino      |  2 +-
 Software/Gravity/Interactions.ino |  6 +++---
 Software/Gravity/UI.ino           | 11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Software/Gravity/Gravity.ino b/Software/Gravity/Gravity.ino
index f3fff67..4f3beaf 100644
--- a/Software/Gravity/Gravity.ino
+++ b/Software/Gravity/Gravity.ino
@@ -452,7 +452,7 @@ void calculateCycles() {
     }
     playingModes[i] = subDivs[channels[i].subDiv - mod];  //subtracting because the innitial array is backwards
 
-    if (channels[i].mode == 2) { //Sequencer plays 1/16th
+    if (channels[i].mode == 2 || channels[i].mode == 3) { //Sequencer and swing plays 1/16th
       channelPulsesPerCycle[i] = (PPQN / 4) - 1;
     } else if (playingModes[i] > 0) {
       channelPulsesPerCycle[i] = (playingModes[i] * PPQN) - 1;
diff --git a/Software/Gravity/Interactions.ino b/Software/Gravity/Interactions.ino
index 8c2468a..b2a0d9d 100644
--- a/Software/Gravity/Interactions.ino
+++ b/Software/Gravity/Interactions.ino
@@ -181,10 +181,10 @@ void checkInputs() {
                 && displayTab != 0 
                 && channels[displayTab - 1].mode == 3) { //Change SWING
         channels[displayTab - 1].swing = channels[displayTab - 1].swing + change;
-        if (channels[displayTab - 1].swing > 100) {
+        if (channels[displayTab - 1].swing > 6) {
           channels[displayTab - 1].swing = 0;
-        } else if (channels[displayTab - 1].swing > 6) {
-          channels[displayTab - 1].swing = 6;
+        } else if (channels[displayTab - 1].swing > 5) {
+          channels[displayTab - 1].swing = 5;
         }
         saveState();
       } else if (((!insideTab && shiftBtnPushed) 
diff --git a/Software/Gravity/UI.ino b/Software/Gravity/UI.ino
index 78c1b81..1d949b5 100644
--- a/Software/Gravity/UI.ino
+++ b/Software/Gravity/UI.ino
@@ -118,7 +118,13 @@ void updateScreen() {
       //Channel Tabs
       else {
         //Menu items
-        lastMenuItem = 3;
+        if (channels[displayTab - 1].mode == 3) {
+          lastMenuItem = 1;
+        } else if (channels[displayTab - 1].mode == 4) {
+          lastMenuItem = 2;
+        } else {
+          lastMenuItem = 3;
+        }
         width = 32;
         leftOffset = 62;
         for (byte i = 1; i <= lastMenuItem; i++) {
@@ -229,7 +235,8 @@ void updateScreen() {
             valueStr = valueStr + String(channels[displayTab - 1].seqPattern - 7);
           }
         } else if (channels[displayTab - 1].mode == 3) {
-          valueStr = String(channels[displayTab - 1].swing) + "%"; 
+          byte swingVals[6] = {50, 54, 58, 62, 66, 71};
+          valueStr = String(swingVals[channels[displayTab - 1].swing]) + "%"; 
         } else if (channels[displayTab - 1].mode == 4) {
           valueStr = String(channels[displayTab - 1].gate); 
         }