diff --git a/.gitignore b/.gitignore index 5c03893..01dc6de 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,8 @@ Hardware/gtoe/_autosave-gtoe.kicad_pcb Hardware/gtoe/gtoe.kicad_sch-bak Hardware/gtoe/_autosave-gtoe.kicad_sch Software/Gravity/build/arduino.avr.nano -Software/Gravity/build/arduino.avr.nano \ No newline at end of file +Software/Gravity/build/arduino.avr.nano +Hardware/gtoe/midi-backups +Hardware/gtoe/midi-panel-backups +Hardware/gtoe/MIDI Board REV1.zip +Hardware/gtoe/MIDI Panel REV1.zip \ No newline at end of file diff --git a/Software/Gravity/Gravity.ino b/Software/Gravity/Gravity.ino index 0fa175a..7bcf237 100644 --- a/Software/Gravity/Gravity.ino +++ b/Software/Gravity/Gravity.ino @@ -5,7 +5,7 @@ #include #include -const char version[5] = "MIDI Test"; +const char version[5] = "v:1.b"; #define SCREEN_ADDRESS 0x3C diff --git a/Software/Gravity/Interactions.ino b/Software/Gravity/Interactions.ino index 6626082..7d00da2 100644 --- a/Software/Gravity/Interactions.ino +++ b/Software/Gravity/Interactions.ino @@ -247,8 +247,8 @@ void checkInputs() { channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change; if (channels[displayTab - 1].subDiv > 200) { channels[displayTab - 1].subDiv = 0; - } else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(byte)) - 1) { - channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(byte)) - 1; + } else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(int)) - 1) { + channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(int)) - 1; } if (!isPlaying) { calculateCycles(); @@ -386,7 +386,7 @@ void checkInputs() { } else if (digitalRead(SHIFT_BTN_PIN) && shiftBtnPushed) { shiftBtnPushed = false; shiftReleasedTime = millis(); - if (shiftReleasedTime - shiftPressedTime > 500 && isRecording) { //&& shiftReleasedTime - shiftPressedTime < 2000 + if (shiftReleasedTime - shiftPressedTime > 500) { //&& shiftReleasedTime - shiftPressedTime < 2000 for (byte i = 0; i < 16; i++) { patternToEdit[i] = 0; } diff --git a/Software/Gravity/UI.ino b/Software/Gravity/UI.ino index ba053ac..fd4d4b4 100644 --- a/Software/Gravity/UI.ino +++ b/Software/Gravity/UI.ino @@ -274,17 +274,19 @@ void updateScreen() { } } - //Edit Pattern Screen + //Edit Pattern Screen (Sequencer) else if (displayScreen == 1) { + u8g2.setFont(velvetscreen); byte pattern = channels[displayTab - 1].seqPattern; String patStr; if (pattern < 8) { - patStr = "EDIT PATTERN A" + String(pattern + 1); + patStr = "PATTERN A" + String(pattern + 1); } else { - patStr = "EDIT PATTERN B" + String(pattern - 7); + patStr = "PATTERN B" + String(pattern - 7); } - char patChar[16]; - patStr.toCharArray(patChar, 16); + //patStr = "TEST"; + char patChar[11]; + patStr.toCharArray(patChar, 11); u8g2.drawButtonUTF8(64, 5, U8G2_BTN_BW1|U8G2_BTN_HCENTER, 128, 0, 2, patChar ); for (byte i = 0; i < 8; i++) { if (patternToEdit[i]) {