Oleksiy/GravityFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI tweaks for new modes

Browse Source
This commit is contained in:
Oleksiy
2024-10-18 15:46:34 +03:00
parent 3cd323d5b9
commit a7fc9663da
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Software/Gravity/Gravity.ino
View File

@ -452,7 +452,7 @@ void calculateCycles() {
} }
playingModes[i] = subDivs[channels[i].subDiv - mod]; //subtracting because the innitial array is backwards 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; channelPulsesPerCycle[i] = (PPQN / 4) - 1;
} else if (playingModes[i] > 0) { } else if (playingModes[i] > 0) {
channelPulsesPerCycle[i] = (playingModes[i] * PPQN) - 1; channelPulsesPerCycle[i] = (playingModes[i] * PPQN) - 1;

6
Software/Gravity/Interactions.ino
View File

@ -181,10 +181,10 @@ void checkInputs() {
&& displayTab != 0 && displayTab != 0
&& channels[displayTab - 1].mode == 3) { //Change SWING && channels[displayTab - 1].mode == 3) { //Change SWING
channels[displayTab - 1].swing = channels[displayTab - 1].swing + change; 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; channels[displayTab - 1].swing = 0;
} else if (channels[displayTab - 1].swing > 6) { } else if (channels[displayTab - 1].swing > 5) {
channels[displayTab - 1].swing = 6; channels[displayTab - 1].swing = 5;
} }
saveState(); saveState();
} else if (((!insideTab && shiftBtnPushed) } else if (((!insideTab && shiftBtnPushed)

9
Software/Gravity/UI.ino
View File

@ -118,7 +118,13 @@ void updateScreen() {
//Channel Tabs //Channel Tabs
else { else {
//Menu items //Menu items
if (channels[displayTab - 1].mode == 3) {
lastMenuItem = 1;
} else if (channels[displayTab - 1].mode == 4) {
lastMenuItem = 2;
} else {
lastMenuItem = 3; lastMenuItem = 3;
}
width = 32; width = 32;
leftOffset = 62; leftOffset = 62;
for (byte i = 1; i <= lastMenuItem; i++) { for (byte i = 1; i <= lastMenuItem; i++) {
@ -229,7 +235,8 @@ void updateScreen() {
valueStr = valueStr + String(channels[displayTab - 1].seqPattern - 7); valueStr = valueStr + String(channels[displayTab - 1].seqPattern - 7);
} }
} else if (channels[displayTab - 1].mode == 3) { } 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) { } else if (channels[displayTab - 1].mode == 4) {
valueStr = String(channels[displayTab - 1].gate); valueStr = String(channels[displayTab - 1].gate);
} }