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 +20920 -7936
81 changed files with 20920 additions and 7936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c5d744789 - Show all commits

2
Software/Gravity/Gravity.ino
View File

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

4
Software/Gravity/Interactions.ino
View File

@ -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;
}