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

Started reworking menu to include main param

Browse Source
This commit is contained in:
Oleksiy
2023-08-06 22:02:42 +03:00
parent fc622a1663
commit aec68332e4
3 changed files with 108 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Software/Gravity/Interactions.ino
View File

@ -11,7 +11,7 @@ void checkInputs() {
if (encReleasedTime - encPressedTime < 500) { // press shorter than .5s is for entering the submenu
if (!insideTab && displayScreen == 0) {
insideTab = true;
} else if (insideTab && channels[displayTab - 1].mode == 2 && menuItem == 1 && displayScreen == 0) { //enter the pattern editor
} else if (insideTab && channels[displayTab - 1].mode == 2 && menuItem == 2 && displayScreen == 0) { //enter the pattern editor
if (channels[displayTab - 1].seqPattern == 0) {
patternToEdit = seqA1;
} else if (channels[displayTab - 1].seqPattern == 1) {
@ -58,11 +58,9 @@ void checkInputs() {
rotateScreen = !rotateScreen;
saveState();
checkScreenRotation();
//setup();
//resetFunc();
} else if (displayScreen == 2 && menuItem == 2) {
EEPROM.put(1023, memCode - 1);
resetFunc();
reboot();
}
updateScreen();
} else if (encReleasedTime - encPressedTime < 2000) { // longer press (<2s) is for navigating back. longer than 2s presses are ignored
@ -137,7 +135,7 @@ void checkInputs() {
} else if (menuItem > lastMenuItem) {
menuItem = lastMenuItem;
}
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 0) { //Master Clock Mode
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 1) { //Master Clock Mode
masterClockMode = masterClockMode + change;
if (masterClockMode > 100) {
masterClockMode = 0;
@ -145,7 +143,7 @@ void checkInputs() {
masterClockMode = 1;
}
saveState();
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 1) { //Modulation channel
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 2) { //Modulation channel
bpmModulationChannel = bpmModulationChannel + change;
if (bpmModulationChannel == 0 || bpmModulationChannel == 1) {
bpmModulationRange = 1;
@ -156,7 +154,7 @@ void checkInputs() {
bpmModulationChannel = 1;
}
saveState();
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 2) { //Modulation range
} else if (insideTab && shiftBtnPushed && displayTab == 0 && menuItem == 3) { //Modulation range
bpmModulationRange = bpmModulationRange + change;
if (bpmModulationRange == 0) {
bpmModulationRange = 1;
@ -166,7 +164,7 @@ void checkInputs() {
bpmModulationRange = 5;
}
saveState();
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 0) { //Channel Mode
} else if (insideTab && shiftBtnPushed && 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;
@ -176,7 +174,7 @@ void checkInputs() {
channels[displayTab - 1].CV1Target = 0;
channels[displayTab - 1].CV2Target = 0;
saveState();
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 1 && channels[displayTab - 1].mode == 0) { //Offset
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 2 && 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;
@ -184,7 +182,7 @@ void checkInputs() {
channels[displayTab - 1].offset = channelPulsesPerCycle[displayTab-1];
}
saveState();
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 1 && channels[displayTab - 1].mode == 1) { //SUBDIV for RANDOM
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 2 && channels[displayTab - 1].mode == 1) { //SUBDIV for RANDOM
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
if (channels[displayTab - 1].subDiv > 200) {
channels[displayTab - 1].subDiv = 0;
@ -195,7 +193,7 @@ void checkInputs() {
calculateCycles();
}
saveState();
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 2 && channels[displayTab - 1].mode == 0) { //CV1 for CLK
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 3 && 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;
@ -204,7 +202,7 @@ void checkInputs() {
}
saveState();
}
else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 3 && channels[displayTab - 1].mode == 0) { //CV2 for CLK
else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 4 && 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;
@ -212,7 +210,7 @@ void checkInputs() {
channels[displayTab - 1].CV2Target = 1;
}
saveState();
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 2 && channels[displayTab - 1].mode == 1) { //CV1 for RND
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 3 && 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;
@ -221,7 +219,7 @@ void checkInputs() {
}
saveState();
}
else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 3 && channels[displayTab - 1].mode == 1) { //CV2 for RND
else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 4 && 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;