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

Updated pattern editor screen, fixed some minor bugs

Browse Source
This commit is contained in:
Oleksiy
2023-08-03 21:36:08 +03:00
parent d8398eb986
commit 4c6c68e260
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Software/Gravity/Gravity.ino
View File

@ -72,7 +72,7 @@ byte currentStep = 0;
byte stepNumSelected = 0; byte stepNumSelected = 0;
bool *patternToEdit; bool *patternToEdit;
byte memCode = 'a'; //Change to different letter if you changed the data structure byte memCode = 'A'; //Change to different letter if you changed the data structure
unsigned int channelPulseCount[6]; unsigned int channelPulseCount[6];
unsigned int channelPulsesPerCycle[6]; unsigned int channelPulsesPerCycle[6];

2
Software/Gravity/Interactions.ino
View File

@ -156,6 +156,8 @@ void checkInputs() {
} else if (channels[displayTab - 1].mode > 2) { } else if (channels[displayTab - 1].mode > 2) {
channels[displayTab - 1].mode = 2; channels[displayTab - 1].mode = 2;
} }
channels[displayTab - 1].CV1Target = 0;
channels[displayTab - 1].CV2Target = 0;
saveState(); saveState();
} else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 1 && channels[displayTab - 1].mode == 0) { //Offset } else if (insideTab && shiftBtnPushed && displayTab != 0 && menuItem == 1 && channels[displayTab - 1].mode == 0) { //Offset
channels[displayTab - 1].offset = channels[displayTab - 1].offset + change; channels[displayTab - 1].offset = channels[displayTab - 1].offset + change;

19
Software/Gravity/UI.ino
View File

@ -273,12 +273,21 @@ void updateScreen() {
} }
//Edit Pattern Screen //Edit Pattern Screen
else if (displayScreen == 1) { else if (displayScreen == 1) {
byte pattern = channels[displayTab - 1].seqPattern;
String patStr;
if (pattern < 8) {
patStr = "EDIT PATTERN A" + String(pattern + 1);
} else {
patStr = "EDIT PATTERN B" + String(pattern - 7);
}
char patChar[16];
patStr.toCharArray(patChar, 16);
u8g2.drawUTF8(31, 5, 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, 20, "q"); u8g2.drawUTF8(19 + i*12, 24, "q");
} else { } else {
u8g2.drawUTF8(19 + i*12, 20, "p"); u8g2.drawUTF8(19 + i*12, 24, "p");
} }
} }
for (byte i = 8; i < 16; i++) { for (byte i = 8; i < 16; i++) {
@ -290,14 +299,14 @@ void updateScreen() {
} }
if (!isRecording) { if (!isRecording) {
if (stepNumSelected < 8 ) { if (stepNumSelected < 8 ) {
u8g2.drawFrame(16 + stepNumSelected * 12, 12, 11, 11); u8g2.drawFrame(16 + stepNumSelected * 12, 16, 11, 11);
} else { } else {
u8g2.drawFrame(16 + (stepNumSelected-8) * 12, 32, 11, 11); u8g2.drawFrame(16 + (stepNumSelected-8) * 12, 32, 11, 11);
} }
} }
if (isRecording) { if (isRecording) {
u8g2.drawUTF8(44, 60, "RECORDING"); u8g2.drawUTF8(43, 60, "RECORDING");
} }
} }