diff --git a/Software/Gravity/Gravity.ino b/Software/Gravity/Gravity.ino index 806fb8a..acde9ad 100644 --- a/Software/Gravity/Gravity.ino +++ b/Software/Gravity/Gravity.ino @@ -5,7 +5,7 @@ #include #include -const char version[5] = "v:1.1"; +const char version[5] = "1.1b3"; #define SCREEN_ADDRESS 0x3C diff --git a/Software/Gravity/Interactions.ino b/Software/Gravity/Interactions.ino index 7a97310..e699b7c 100644 --- a/Software/Gravity/Interactions.ino +++ b/Software/Gravity/Interactions.ino @@ -65,7 +65,7 @@ void checkInputs() { EEPROM.put(1023, memCode - 1); 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) { displayScreen = 0; } else if (menuItemSelected == 1) { @@ -399,7 +399,7 @@ void checkInputs() { } else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) { shiftBtnPushed = false; 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++) { patternToEdit[i] = 0; }