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

Rev 6 #1

Merged
oleksiy merged 37 commits from hardware-rev-4 into main 2024-08-25 12:37:13 +00:00
Conversation 0 Commits 37 Files Changed 120 +39498 -7941
105 changed files with 39498 additions and 7941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2de9ca6e9 - Show all commits

7
Software/Gravity/Interactions.ino
View File

@ -66,10 +66,10 @@ void checkInputs() {
reboot(); reboot();
} }
} else if (encReleasedTime - encPressedTime > 500 && !shiftBtnPushed) { // longer press is for navigating back. longer than 2s presses are no longer ignored (used do be < 2000) } else if (encReleasedTime - encPressedTime > 500 && !shiftBtnPushed) { // longer press is for navigating back. longer than 2s presses are no longer ignored (used do be < 2000)
if (displayScreen != 0) { if (menuItemSelected == 1) {
displayScreen = 0;
} else if (menuItemSelected == 1) {
menuItemSelected = 0; menuItemSelected = 0;
} else if (displayScreen != 0) {
displayScreen = 0;
} else if (insideTab == 1) { } else if (insideTab == 1) {
insideTab = 0; insideTab = 0;
menuItem = 0; menuItem = 0;
@ -405,6 +405,7 @@ void checkInputs() {
} }
} else if (shiftReleasedTime - shiftPressedTime > 2000 && encBtnPushed) { } else if (shiftReleasedTime - shiftPressedTime > 2000 && encBtnPushed) {
displayScreen = 2; displayScreen = 2;
menuItemSelected = 1; //hack to prevent from going back when the encoder is released
} }
saveState(); saveState();
updateScreen(); updateScreen();