From 4a5b1662f9157fffc7017f063a36b7d28c9ff9fd Mon Sep 17 00:00:00 2001 From: Oleksiy Date: Fri, 29 Nov 2024 14:32:57 +0200 Subject: [PATCH] some changes to swing --- Software/Gravity/Gravity.ino | 4 ++-- Software/Gravity/Interactions.ino | 6 +++--- Software/Gravity/UI.ino | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Software/Gravity/Gravity.ino b/Software/Gravity/Gravity.ino index ee27285..251cd5c 100644 --- a/Software/Gravity/Gravity.ino +++ b/Software/Gravity/Gravity.ino @@ -11,7 +11,7 @@ #define VERSION "V:1.2A" -byte memCode = 'D'; //Change to different letter if you changed the data structure +byte memCode = 'd'; //Change to different letter if you changed the data structure uint16_t CV1Calibration = 512; uint16_t CV2Calibration = 512; @@ -449,7 +449,7 @@ void calculateCycles() { } playingModes[i] = subDivs[channels[i].subDiv - mod]; //subtracting because the innitial array is backwards - if (channels[i].mode == 2) { //} || channels[i].mode == 3) { //Sequencer and swing 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 b2a0d9d..7175344 100644 --- a/Software/Gravity/Interactions.ino +++ b/Software/Gravity/Interactions.ino @@ -266,10 +266,10 @@ void checkInputs() { && displayTab != 0 && menuItem == 1) { //Channel Mode channels[displayTab - 1].mode = channels[displayTab - 1].mode + change; - if (channels[displayTab - 1].mode > 100) { - channels[displayTab - 1].mode = 0; + if (channels[displayTab - 1].mode == 7) { + channels[displayTab - 1].mode = 4; //to make it cycle through all the modes } else if (channels[displayTab - 1].mode > 4) { - channels[displayTab - 1].mode = 4; + channels[displayTab - 1].mode = 0; } channels[displayTab - 1].CV1Target = 0; channels[displayTab - 1].CV2Target = 0; diff --git a/Software/Gravity/UI.ino b/Software/Gravity/UI.ino index 1d949b5..f898b3d 100644 --- a/Software/Gravity/UI.ino +++ b/Software/Gravity/UI.ino @@ -235,7 +235,7 @@ void updateScreen() { valueStr = valueStr + String(channels[displayTab - 1].seqPattern - 7); } } else if (channels[displayTab - 1].mode == 3) { - byte swingVals[6] = {50, 54, 58, 62, 66, 71}; + byte swingVals[6] = {50, 58, 66, 75, 83, 92}; valueStr = String(swingVals[channels[displayTab - 1].swing]) + "%"; } else if (channels[displayTab - 1].mode == 4) { valueStr = String(channels[displayTab - 1].gate);