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

fixed the bug prevetnting settings menu to opening

Browse Source
This commit is contained in:
Oleksiy
2024-01-23 01:00:47 +02:00
parent b88355b408
commit 7c5d744789
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Software/Gravity/Gravity.ino
View File

@ -5,7 +5,7 @@
#include <U8g2lib.h> #include <U8g2lib.h>
#include <avr/wdt.h> #include <avr/wdt.h>
const char version[5] = "v:1.1"; const char version[5] = "1.1b3";
#define SCREEN_ADDRESS 0x3C #define SCREEN_ADDRESS 0x3C

4
Software/Gravity/Interactions.ino
View File

@ -65,7 +65,7 @@ void checkInputs() {
EEPROM.put(1023, memCode - 1); EEPROM.put(1023, memCode - 1);
reboot(); reboot();
} }
} else if (encReleasedTime - encPressedTime > 500) { // 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 (displayScreen != 0) {
displayScreen = 0; displayScreen = 0;
} else if (menuItemSelected == 1) { } else if (menuItemSelected == 1) {
@ -399,7 +399,7 @@ void checkInputs() {
} else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) { } else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) {
shiftBtnPushed = false; shiftBtnPushed = false;
shiftReleasedTime = millis(); shiftReleasedTime = millis();
if (displayScreen == 1 && shiftReleasedTime - shiftPressedTime > 500) { //&& shiftReleasedTime - shiftPressedTime < 2000 //Clear the sequence if (displayScreen == 1 && shiftReleasedTime - shiftPressedTime > 500 && !encBtnPushed) { //&& shiftReleasedTime - shiftPressedTime < 2000 //Clear the sequence
for (byte i = 0; i < 16; i++) { for (byte i = 0; i < 16; i++) {
patternToEdit[i] = 0; patternToEdit[i] = 0;
} }