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

More UI changes

Browse Source
This commit is contained in:
Oleksiy
2023-07-23 23:09:38 +03:00
parent 3a41da4d58
commit ddce619aed
3 changed files with 198 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
software/GToE/InputsCheck.ino
View File

@ -8,27 +8,16 @@ void checkInputs() {
encPressRegistered = false;
encReleasedTime = millis();
/*if (encReleasedTime - encPressedTime < 500) { // press shorter than .5s switches tabs
if (encReleasedTime - encPressedTime < 500) { // press shorter than .5s is for entering the submenu
if (insideTab == 0) {
displayTabOld = displayTab;
displayTab++;
if (displayTab > 6) {
displayTab = 0;
}
} else if (insideTab < 3 && displayTab != 0) {
insideTab++;
} else if (insideTab < 2 && displayTab == 0) {
insideTab++;
} else {
insideTab = 1;
}
}
updateScreen();
} else */ if (encReleasedTime - encPressedTime < 2000) { // longer press (<2s) and switches random mode, longer than 2s presses are ignored
if (insideTab == 0) {
insideTab = 1;
} else {
} else if (encReleasedTime - encPressedTime < 2000) { // longer press (<2s) is for navigating back. longer than 2s presses are ignored
if (insideTab == 1) {
insideTab = 0;
}
menuItem = 0;
}
updateScreen();
}
}
@ -63,15 +52,22 @@ void checkInputs() {
if (!isPlaying) {
calculateCycles();
}
}
/* if (displayTab == 0 && insideTab == 0 && masterClockMode == 0) {
bpm = bpm + change;
if (bpm > MAXBPM) {
bpm = MAXBPM;
} else if (bpm < MINBPM) {
bpm = MINBPM;
} else if (insideTab && !shiftBtnPushed) {
menuItem = menuItem + change;
if (menuItem > 100) { //for "negative" values
menuItem = 0;
} else if (menuItem > lastMenuItem) {
menuItem = lastMenuItem;
}
calculateBPMTiming();
} else if (insideTab && shiftBtnPushed && displayTab !=0 && menuItem == 1) { //RANDOM
channels[displayTab - 1].random = channels[displayTab - 1].random + change;
if (channels[displayTab - 1].random > 1000) {
channels[displayTab - 1].random = 0;
} else if (channels[displayTab - 1].random > 9) {
channels[displayTab - 1].random = 9;
}
}
/*
} else if (displayTab == 0 && insideTab == 1) { //Clock mode
masterClockMode = masterClockMode + change;
@ -157,13 +153,14 @@ void checkInputs() {
//shift button
if (!digitalRead(SHIFT_BTN_PIN) && !shiftBtnPushed) {
shiftBtnPushed = true;
display.fillRoundRect(120, 52, 8, 8, 3, SSD1306_WHITE);
display.display();
//display.fillRoundRect(120, 52, 8, 8, 3, SSD1306_WHITE);
//display.display();
updateScreen();
} else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) {
shiftBtnPushed = false;
display.fillRoundRect(120, 52, 8, 8, 3, SSD1306_BLACK);
display.display();
//display.fillRoundRect(120, 52, 8, 8, 3, SSD1306_BLACK);
//display.display();
updateScreen();
}
//modulations