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

Added empty (for now) settings screen

Browse Source
This commit is contained in:
Oleksiy
2023-08-05 00:40:44 +03:00
parent c5a252cb34
commit cdb4cb58a2
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Software/Gravity/Gravity.ino
View File

@ -25,8 +25,8 @@
#define ANALOGUE_INPUT_2_PIN A6 #define ANALOGUE_INPUT_2_PIN A6
const byte outsPins[6] = { 7, 8, 10, 6, 9, 11 }; const byte outsPins[6] = { 7, 8, 10, 6, 9, 11 };
int CV1Calibration; int CV1Calibration = 0;
int CV2Calibration; int CV2Calibration = 0;
const int subDivs[17] = { -24, -12, -8, -6, -4, -3, -2, 1, 2, 3, 4, 5, 6, 7, 8, 16, 32 }; //positive - divide, negative - multiply, 0 - off const int subDivs[17] = { -24, -12, -8, -6, -4, -3, -2, 1, 2, 3, 4, 5, 6, 7, 8, 16, 32 }; //positive - divide, negative - multiply, 0 - off
@ -115,7 +115,7 @@ unsigned long playPressedTime;
unsigned long playReleasedTime; unsigned long playReleasedTime;
unsigned long shiftPressedTime; unsigned long shiftPressedTime;
unsigned long shiftReleasedTime; unsigned long shiftReleasedTime;
bool encPressRegistered; bool encBtnPushed;
//unsigned long lastInteractionTime; // used for display timeout //unsigned long lastInteractionTime; // used for display timeout

20
Software/Gravity/Interactions.ino
View File

@ -1,11 +1,11 @@
void checkInputs() { void checkInputs() {
//encoder button //encoder button
if (!digitalRead(ENC_BTN_PIN) && !encPressRegistered) { if (!digitalRead(ENC_BTN_PIN) && !encBtnPushed) {
encPressRegistered = true; encBtnPushed = true;
encPressedTime = millis(); encPressedTime = millis();
} else if (digitalRead(ENC_BTN_PIN) && encPressRegistered) { } else if (digitalRead(ENC_BTN_PIN) && encBtnPushed) {
encPressRegistered = false; encBtnPushed = false;
encReleasedTime = millis(); encReleasedTime = millis();
if (encReleasedTime - encPressedTime < 500) { // press shorter than .5s is for entering the submenu if (encReleasedTime - encPressedTime < 500) { // press shorter than .5s is for entering the submenu
@ -47,8 +47,11 @@ void checkInputs() {
} }
displayScreen = 1; displayScreen = 1;
isRecording = 0; isRecording = 0;
} else if (displayScreen == 1) { } else if (displayScreen == 1 && !isRecording) {
isRecording = !isRecording; isPlaying = 1;
isRecording = 1;
} else if (displayScreen == 1 && isRecording) {
isRecording = 0;
} }
updateScreen(); updateScreen();
} else if (encReleasedTime - encPressedTime < 2000) { // longer press (<2s) is for navigating back. longer than 2s presses are ignored } else if (encReleasedTime - encPressedTime < 2000) { // longer press (<2s) is for navigating back. longer than 2s presses are ignored
@ -60,6 +63,9 @@ void checkInputs() {
isRecording = 0; isRecording = 0;
} }
updateScreen(); updateScreen();
} else if (encReleasedTime - encPressedTime > 2000 && shiftBtnPushed) {
displayScreen = 2;
updateScreen();
} }
} }
@ -264,6 +270,8 @@ void checkInputs() {
for (byte i = 0; i < 16; i++) { for (byte i = 0; i < 16; i++) {
patternToEdit[i] = 0; patternToEdit[i] = 0;
} }
} else if (shiftReleasedTime - shiftPressedTime > 2000 && encBtnPushed) {
displayScreen = 2;
} }
saveState(); saveState();
updateScreen(); updateScreen();

14
Software/Gravity/UI.ino
View File

@ -271,6 +271,7 @@ void updateScreen() {
u8g2.drawUTF8(122, yPos, "r"); u8g2.drawUTF8(122, yPos, "r");
} }
} }
//Edit Pattern Screen //Edit Pattern Screen
else if (displayScreen == 1) { else if (displayScreen == 1) {
byte pattern = channels[displayTab - 1].seqPattern; byte pattern = channels[displayTab - 1].seqPattern;
@ -282,7 +283,8 @@ void updateScreen() {
} }
char patChar[16]; char patChar[16];
patStr.toCharArray(patChar, 16); patStr.toCharArray(patChar, 16);
u8g2.drawUTF8(31, 5, patChar); //u8g2.drawUTF8(31, 5, patChar);
u8g2.drawButtonUTF8(64, 5, U8G2_BTN_BW1|U8G2_BTN_HCENTER, 128, 0, 2, patChar );
for (byte i = 0; i < 8; i++) { for (byte i = 0; i < 8; i++) {
if (patternToEdit[i]) { if (patternToEdit[i]) {
u8g2.drawUTF8(19 + i*12, 24, "q"); u8g2.drawUTF8(19 + i*12, 24, "q");
@ -306,9 +308,15 @@ void updateScreen() {
} }
if (isRecording) { if (isRecording) {
u8g2.drawUTF8(43, 60, "RECORDING"); //u8g2.drawUTF8(43, 60, "RECORDING");
u8g2.drawButtonUTF8(64, 62, U8G2_BTN_BW1|U8G2_BTN_HCENTER|U8G2_BTN_INV, 50, 0, 2, "RECORDING" );
} }
} }
//Settings Screen
else if (displayScreen == 2) {
u8g2.drawButtonUTF8(64, 5, U8G2_BTN_BW1|U8G2_BTN_HCENTER, 128, 0, 2, "SETTINGS" );
}
} while ( u8g2.nextPage() ); } while ( u8g2.nextPage() );
} }