oleksiy/GravityHW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Almost done with the menu

Browse Source
This commit is contained in:
Oleksiy
2023-07-29 10:55:39 +03:00
parent b4f89a838d
commit 1b9611f374
4 changed files with 212 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
Software/Gravity/InputsCheck.ino
View File

@ -43,11 +43,11 @@ void checkInputs() {
}
calculateBPMTiming();
} else if (!insideTab && shiftBtnPushed && displayTab != 0) { //Change Subdiv
channels[displayTab - 1].mode = channels[displayTab - 1].mode - change;
if (channels[displayTab - 1].mode == 65535) { //65535 is 0-1 for unsigned vars
channels[displayTab - 1].mode = 0;
} else if (channels[displayTab - 1].mode > (sizeof(subDivs) / sizeof(int)) - 1) {
channels[displayTab - 1].mode = (sizeof(subDivs) / sizeof(int)) - 1;
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
if (channels[displayTab - 1].subDiv > 200) {
channels[displayTab - 1].subDiv = 0;
} else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(byte)) - 1) {
channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(byte)) - 1;
}
if (!isPlaying) {
calculateCycles();
@ -62,61 +62,83 @@ void checkInputs() {
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 0) { //Master Clock Mode
masterClockMode = masterClockMode + change;
if (masterClockMode > 100) {
masterClockMode = 1;
} else if (masterClockMode > 1) {
masterClockMode = 0;
} else if (masterClockMode > 1) {
masterClockMode = 1;
}
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 1) { //RANDOM
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 1) { //Modulation channel
bpmModulationChannel = bpmModulationChannel + change;
if (bpmModulationChannel == 0 || bpmModulationChannel == 1) {
bpmModulationRange = 1;
} else if (bpmModulationChannel > 100) {
bpmModulationRange = 0;
bpmModulationChannel = 255;
} else if (bpmModulationChannel > 1) {
bpmModulationChannel = 1;
}
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 2) { //Modulation range
bpmModulationRange = bpmModulationRange + change;
if (bpmModulationRange == 0) {
bpmModulationRange = 1;
} else if (bpmModulationRange > 100) {
bpmModulationRange = 1;
} else if (bpmModulationRange > 5) { //50bpm
bpmModulationRange = 5;
}
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 0) { //Channel Mode
channels[displayTab - 1].mode = channels[displayTab - 1].mode + change;
if (channels[displayTab - 1].mode > 100) {
channels[displayTab - 1].mode = 0;
} else if (channels[displayTab - 1].mode > 2) {
channels[displayTab - 1].mode = 2;
}
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 1 && channels[displayTab - 1].mode == 0) { //Offset
channels[displayTab - 1].offset = channels[displayTab - 1].offset + change;
if (channels[displayTab - 1].offset > 100) {
channels[displayTab - 1].offset = 0;
} else if (channels[displayTab - 1].offset > channelPulsesPerCycle[displayTab-1]) {
channels[displayTab - 1].offset = channelPulsesPerCycle[displayTab-1];
}
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 1 && channels[displayTab - 1].mode == 1) { //RANDOM
channels[displayTab - 1].random = channels[displayTab - 1].random + change;
if (channels[displayTab - 1].random > 1000) {
if (channels[displayTab - 1].random > 100) {
channels[displayTab - 1].random = 0;
} else if (channels[displayTab - 1].random > 9) {
channels[displayTab - 1].random = 9;
}
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 2 && channels[displayTab - 1].mode == 0) { //CV1 for CLK
channels[displayTab - 1].CV1Target = channels[displayTab - 1].CV1Target + change;
if (channels[displayTab - 1].CV1Target > 100) {
channels[displayTab - 1].CV1Target = 0;
} else if (channels[displayTab - 1].CV1Target > 1) {
channels[displayTab - 1].CV1Target = 1;
}
}
else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 3 && channels[displayTab - 1].mode == 0) { //CV2 for CLK
channels[displayTab - 1].CV2Target = channels[displayTab - 1].CV2Target + change;
if (channels[displayTab - 1].CV2Target > 100) {
channels[displayTab - 1].CV2Target = 0;
} else if (channels[displayTab - 1].CV2Target > 1) {
channels[displayTab - 1].CV2Target = 1;
}
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 2 && channels[displayTab - 1].mode == 1) { //CV1 for RND
channels[displayTab - 1].CV1Target = channels[displayTab - 1].CV1Target + change;
if (channels[displayTab - 1].CV1Target > 100) {
channels[displayTab - 1].CV1Target = 0;
} else if (channels[displayTab - 1].CV1Target > 2) {
channels[displayTab - 1].CV1Target = 2;
}
}
else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 3 && channels[displayTab - 1].mode == 1) { //CV2 for RND
channels[displayTab - 1].CV2Target = channels[displayTab - 1].CV2Target + change;
if (channels[displayTab - 1].CV2Target > 100) {
channels[displayTab - 1].CV2Target = 0;
} else if (channels[displayTab - 1].CV2Target > 2) {
channels[displayTab - 1].CV2Target = 2;
}
}
/*
} else if (displayTab == 0 && insideTab == 1) { //Clock mode
masterClockMode = masterClockMode + change;
if (masterClockMode > 250) {
masterClockMode = 0;
} else if (masterClockMode > 3) {
masterClockMode = 3;
}
} else if (displayTab == 0 && insideTab == 2 && masterClockMode == 0) { //bpm modulation
bpmModulationRange = bpmModulationRange + change;
if (bpmModulationRange == 255 && bpmModulationChannel == 0) {
bpmModulationRange = 0;
} else if (bpmModulationRange == 255 && bpmModulationChannel == 1) {
bpmModulationRange = 9;
bpmModulationChannel = 0;
} else if (bpmModulationRange > 9 && bpmModulationChannel == 0) {
bpmModulationRange = 0;
bpmModulationChannel = 1;
} else if (bpmModulationRange > 9 && bpmModulationChannel == 1) {
bpmModulationRange = 9;
}
} else if (displayTab != 0 && insideTab == 0) { //subdivision
channels[displayTab - 1].mode = channels[displayTab - 1].mode - change;
if (channels[displayTab - 1].mode == 65535) { //65535 is 0-1 for unsigned vars
channels[displayTab - 1].mode = 0;
} else if (channels[displayTab - 1].mode > (sizeof(subDivs) / sizeof(int)) - 1) {
channels[displayTab - 1].mode = (sizeof(subDivs) / sizeof(int)) - 1;
}
if (!isPlaying) {
calculateCycles();
}
} else if (displayTab != 0 && insideTab == 1) { //random
channels[displayTab - 1].random = channels[displayTab - 1].random + change;
if (channels[displayTab - 1].random == 65535) {
channels[displayTab - 1].random = 0;
} else if (channels[displayTab - 1].random > 9) {
channels[displayTab - 1].random = 9;
}
} else if (displayTab != 0 && insideTab == 2) { //modulation
channels[displayTab - 1].modulationRange = channels[displayTab - 1].modulationRange + change;
if (channels[displayTab - 1].modulationRange < 0 && channels[displayTab - 1].modulationChannel == 0) {