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

Almost done with the menu

Browse Source
This commit is contained in:
Oleksiy
2023-07-29 10:55:39 +03:00
parent b4f89a838d
commit 1b9611f374
4 changed files with 212 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
Software/Gravity/UI.ino
View File

@ -22,7 +22,7 @@ void updateScreen() {
display.print(F("BPM"));
}
for (int i = 1; i <= 6; i++) {
for (byte i = 1; i <= 6; i++) {
if (displayTab == i) {
if (insideTab == true || shiftBtnPushed == true) {
display.drawRoundRect(i*12 + 12, 46, 13, 18, 3, SSD1306_WHITE);
@ -42,15 +42,16 @@ void updateScreen() {
display.drawRect(0, 46, 128, 2, SSD1306_BLACK); //to crop off parts of tabs round rect
//Submenu
if (insideTab) {
display.fillRoundRect(60, menuItem*12, 68, 10, 2, SSD1306_WHITE);
}
if (displayTab == 0) { //BPM
if (masterClockMode == 0) {
if (masterClockMode == 0 && bpmModulationRange == 0) {
lastMenuItem = 1;
} else if (masterClockMode == 0 && bpmModulationRange != 0) {
lastMenuItem = 2;
} else {
} else if (masterClockMode == 1) {
lastMenuItem = 0;
}
if (menuItem == 0 && insideTab) {
@ -67,21 +68,21 @@ void updateScreen() {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(62, 13);
display.println(F("CV1:"));
display.println(F("MOD:"));
if (menuItem == 2) {
display.setTextColor(SSD1306_BLACK);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(62, 25);
display.println(F("CV2:"));
if (bpmModulationRange != 0) {
display.setCursor(62, 25);
display.println(F("RNG:"));
}
}
} else { //CHANNELS
if (true) { //placeholder for channel modes
if (true) { //placeholder for channel modes with different amount of submenu items
lastMenuItem = 3;
} else {
lastMenuItem = 0;
}
if (menuItem == 0 && insideTab) {
display.setTextColor(SSD1306_BLACK);
@ -96,7 +97,13 @@ void updateScreen() {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(62, 13);
display.println(F("RND:"));
if (channels[displayTab - 1].mode == 0) {
display.println(F("OFT:"));
} else if (channels[displayTab - 1].mode == 1) {
display.println(F("RND:"));
} else if (channels[displayTab - 1].mode == 2) {
display.println(F("PAT:"));
}
if (menuItem == 2) {
display.setTextColor(SSD1306_BLACK);
} else {
@ -133,10 +140,12 @@ void updateScreen() {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(94, 13);
if (bpmModulationRange == 0) {
if (bpmModulationRange != 0 && bpmModulationChannel == 0) {
display.println(F("CV1"));
} else if (bpmModulationRange != 0 && bpmModulationChannel == 1) {
display.println(F("CV2"));
} else if (bpmModulationRange == 0) {
display.println(F("OFF"));
} else {
display.println(bpmModulationRange * 10);
}
if (menuItem == 2) {
display.setTextColor(SSD1306_BLACK);
@ -144,7 +153,9 @@ void updateScreen() {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(94, 25);
display.println(F("OFF"));
if (bpmModulationRange != 0) {
display.println(bpmModulationRange * 10);
}
}
} else { //CHANNELS
@ -154,18 +165,33 @@ void updateScreen() {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(94, 1);
display.println(F("RND"));
if (channels[displayTab - 1].mode == 0) {
display.print(F("CLK"));
} else if (channels[displayTab - 1].mode == 1) {
display.print(F("RND"));
} else if (channels[displayTab - 1].mode == 2) {
display.print(F("SEQ"));
}
if (menuItem == 1) {
display.setTextColor(SSD1306_BLACK);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(94, 13);
if (channels[displayTab - 1].random > 0) {
display.print(channels[displayTab - 1].random);
display.print(F("0% "));
} else {
display.print(F("OFF "));
if (channels[displayTab - 1].mode == 0) { //OFFSET
display.print(channels[displayTab - 1].offset);
display.print(F("/"));
display.print(channelPulsesPerCycle[displayTab-1]+1);
display.print(F(" "));
} else if (channels[displayTab - 1].mode == 1) { //RANDOM
if (channels[displayTab - 1].random > 0) {
display.print(channels[displayTab - 1].random);
display.print(F("0% "));
} else {
display.print(F("OFF "));
}
} else if (channels[displayTab - 1].mode == 2) { //SEQ
display.print(channels[displayTab - 1].seqPattern + 1);
}
if (menuItem == 2) {
display.setTextColor(SSD1306_BLACK);
@ -174,14 +200,14 @@ void updateScreen() {
}
display.setCursor(94, 25);
if (channels[displayTab - 1].CV1Target == 1) {
display.print(F("DIV"));
display.print(channels[displayTab - 1].CV1Value);
display.print(F("SUBDIV"));
//display.print(channels[displayTab - 1].CV1Value);
} else if (channels[displayTab - 1].CV1Target == 2) {
display.print(F("RND"));
display.print(channels[displayTab - 1].CV1Value);
//display.print(channels[displayTab - 1].CV1Value);
} else if (channels[displayTab - 1].CV1Target == 3) {
display.print(F("PAT"));
display.print(channels[displayTab - 1].CV1Value);
//display.print(channels[displayTab - 1].CV1Value);
} else {
display.print(F("OFF "));
}
@ -191,7 +217,18 @@ void updateScreen() {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(94, 37);
display.println(F("OFF"));
if (channels[displayTab - 1].CV2Target == 1) {
display.print(F("DIV"));
//display.print(channels[displayTab - 1].CV2Value);
} else if (channels[displayTab - 1].CV2Target == 2) {
display.print(F("RND"));
//display.print(channels[displayTab - 1].CV2Value);
} else if (channels[displayTab - 1].CV2Target == 3) {
display.print(F("PAT"));
//display.print(channels[displayTab - 1].CV2Value);
} else {
display.print(F("OFF "));
}
}
//Content
@ -225,98 +262,16 @@ void updateScreen() {
display.setTextSize(2);
display.println(F("1/16"));
} else {
if (subDivs[channels[displayTab - 1].mode] == 0) {
if (subDivs[channels[displayTab - 1].subDiv] == 0) {
display.print(F("OFF"));
} else if (subDivs[channels[displayTab - 1].mode] > 0) {
} else if (subDivs[channels[displayTab - 1].subDiv] > 0) {
display.print(F("/"));
display.print(abs(subDivs[channels[displayTab - 1].mode]));
display.print(abs(subDivs[channels[displayTab - 1].subDiv]));
} else {
display.print(F("x"));
display.print(abs(subDivs[channels[displayTab - 1].mode]));
display.print(abs(subDivs[channels[displayTab - 1].subDiv]));
}
}
//Extra params
/*if (displayTab == 0) {
if (insideTab == 1) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.print(F(" CLK:"));
if (masterClockMode == 1) {
display.println(F("EXT24 "));
} else if (masterClockMode == 2) {
display.println(F("EXT-B "));
} else if (masterClockMode == 3) {
display.println(F("EXT16 "));
} else {
display.println(F("INT "));
}
if (insideTab == 2) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58, 16);
display.print(F(" MOD:"));
if (bpmModulationRange != 0 && masterClockMode == 0) {
display.print(F("CV"));
display.print(bpmModulationChannel + 1);
display.print("+");
display.print(bpmModulationRange * 10);
} else {
display.print(F("Off "));
}
} else {
if (insideTab == 1) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.print(F(" RND:"));
if (channels[displayTab - 1].random > 0) {
display.print(channels[displayTab - 1].random);
display.print(F("0% "));
} else {
display.print(F("Off "));
}
if (insideTab == 2) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58, 16);
display.print(F(" MOD:"));
if (channels[displayTab - 1].modulationChannel && channels[displayTab - 1].modulationRange != 0) {
display.print(F("CV2"));
if (channels[displayTab - 1].modulationRange > 0) {
display.print(F("+"));
}
display.print(channels[displayTab - 1].modulationRange);
display.print(F(" "));
} else if (!channels[displayTab - 1].modulationChannel && channels[displayTab - 1].modulationRange != 0) {
display.print(F("CV1"));
if (channels[displayTab - 1].modulationRange > 0) {
display.print(F("+"));
}
display.print(channels[displayTab - 1].modulationRange);
display.print(F(" "));
} else {
display.print(F("Off "));
}
if (insideTab == 3) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58, 32);
display.print(F(" OFT:"));
display.print(channels[displayTab - 1].offset);
display.print(F("/"));
display.print(channelPulsesPerCycle[displayTab - 1] + 1);
display.print(F(" "));
}*/
display.display();
}